Permalink
Browse files

Merge pull request #2 from NiceandGently/master

convert mateconf to gsettings
  • Loading branch information...
stefano-k committed Oct 3, 2012
2 parents 8b06eb1 + c0ea7fe commit 8af5555721e4791d09db088a41c784bf2c4fd7f5
View
@@ -1,4 +1,4 @@
AC_INIT(mate-user-share, 1.4.1)
AC_INIT(mate-user-share, 1.5.0)
AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news])
AM_CONFIG_HEADER(config.h)
@@ -56,11 +56,11 @@ if $have_dbus_1_1 ; then
AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
fi
PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gdk-x11-2.0 gtk+-2.0 mateconf-2.0 dbus-glib-1 libmatenotify libcanberra-gtk $DBUS_MODULES mate-bluetooth-1.0 >= 1.2.0)
PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 >= 2.25.0 gdk-x11-2.0 gtk+-2.0 dbus-glib-1 libmatenotify libcanberra-gtk $DBUS_MODULES mate-bluetooth-1.0 >= 1.2.0)
AC_SUBST(USER_SHARE_CFLAGS)
AC_SUBST(USER_SHARE_LIBS)
PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gtk+-2.0 >= 2.12.0 mateconf-2.0 unique-1.0)
PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gio-2.0 >= 2.25.0 gtk+-2.0 >= 2.12.0 unique-1.0)
AC_SUBST(USER_SHARE_CONFIG_CFLAGS)
AC_SUBST(USER_SHARE_CONFIG_LIBS)
@@ -81,13 +81,11 @@ fi
AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
AC_PATH_PROG(MATECONFTOOL, mateconftool-2, no)
dnl
dnl Enable gsettigns schema macros
dnl
if test x"$MATECONFTOOL" = xno; then
AC_MSG_ERROR([mateconftool-2 executable not found in your path - should be installed with GConf])
fi
AM_MATECONF_SOURCE_2
GLIB_GSETTINGS
dnl where to install the mate-user-share binary
if test "x$prefix" = "xNONE"; then
View
@@ -1,10 +1,5 @@
SUBDIRS = icons
@INTLTOOL_SCHEMAS_RULE@
schemadir = $(MATECONF_SCHEMA_FILE_DIR)
schema_in_files = desktop_mate_file_sharing.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(datadir)/applications
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -17,26 +12,15 @@ autostart_in_files = mate-user-share.desktop.in
appdir = $(datadir)/mate-user-share
app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.ui
install-data-local:
if MATECONF_SCHEMAS_INSTALL
-MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \
$(MATECONFTOOL) --makefile-install-rule $(schema_DATA)
endif
gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml
@GSETTINGS_RULES@
if MATECONF_SCHEMAS_INSTALL
uninstall-local:
-MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \
$(MATECONFTOOL) --makefile-uninstall-rule $(schema_DATA)
endif
EXTRA_DIST = $(schema_in_files) \
EXTRA_DIST = $(gsettings_SCHEMAS) \
$(app_DATA) \
$(desktop_in_files) \
mate-user-share.desktop.in.in \
file-share-properties.ui
CLEANFILES = $(desktop_DATA) $(autostart_DATA)
DISTCLEANFILES = $(schema_DATA)
-include $(top_srcdir)/git.mk

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1,44 @@
<schemalist>
<schema id="org.mate.FileSharing" path="/desktop/mate/file-sharing/">
<key name="enabled" type="b">
<default>false</default>
<summary>Share Public directory over the network</summary>
<description>If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in.</description>
</key>
<key name="require-password" type="s">
<default>'never'</default>
<summary>When to require passwords</summary>
<description>When to ask for passwords. Possible values are "never", "on_write", and "always".</description>
</key>
<key name="bluetooth-enabled" type="b">
<default>false</default>
<summary>Share Public directory over Bluetooth</summary>
<description>If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in.</description>
</key>
<key name="bluetooth-allow-write" type="b">
<default>false</default>
<summary>Whether to allow Bluetooth clients to write files.</summary>
<description>Whether to allow Bluetooth clients to write files, or share the files read-only.</description>
</key>
<key name="bluetooth-require-pairing" type="b">
<default>true</default>
<summary>Whether Bluetooth clients need to pair with the computer to send files.</summary>
<description>Whether Bluetooth clients need to pair with the computer to send files.</description>
</key>
<key name="bluetooth-obexpush-enabled" type="b">
<default>false</default>
<summary>Whether Bluetooth clients can send files using ObexPush.</summary>
<description>If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in.</description>
</key>
<key name="bluetooth-accept-files" type="s">
<default>'bonded'</default>
<summary>When to accept files sent over Bluetooth</summary>
<description>When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask".</description>
</key>
<key name="bluetooth-notify" type="b">
<default>false</default>
<summary>Whether to notify about newly received files.</summary>
<description>Whether to notify about newly received files.</description>
</key>
</schema>
</schemalist>
Oops, something went wrong.

0 comments on commit 8af5555

Please sign in to comment.