From 99c20ca79435c5ab1130258801008b963dd2d098 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Fri, 28 Sep 2012 12:34:50 +0200 Subject: convert to gsettings --- data/Makefile.am | 22 +------- data/desktop_mate_file_sharing.schemas.in | 94 ------------------------------- data/org.mate.FileSharing.gschema.xml | 44 +++++++++++++++ 3 files changed, 47 insertions(+), 113 deletions(-) delete mode 100644 data/desktop_mate_file_sharing.schemas.in create mode 100644 data/org.mate.FileSharing.gschema.xml (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 1f29328..93ce715 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -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,19 +12,10 @@ 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 \ @@ -37,6 +23,4 @@ EXTRA_DIST = $(schema_in_files) \ CLEANFILES = $(desktop_DATA) $(autostart_DATA) -DISTCLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff --git a/data/desktop_mate_file_sharing.schemas.in b/data/desktop_mate_file_sharing.schemas.in deleted file mode 100644 index ea04681..0000000 --- a/data/desktop_mate_file_sharing.schemas.in +++ /dev/null @@ -1,94 +0,0 @@ - - - - - /schemas/desktop/mate/file_sharing/enabled - /desktop/mate/file_sharing/enabled - mate-user-share - bool - false - - Share Public directory over the network - If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in. - - - - /schemas/desktop/mate/file_sharing/require_password - /desktop/mate/file_sharing/require_password - mate-user-share - string - never - - When to require passwords - When to ask for passwords. Possible values are "never", "on_write", and "always". - - - - /schemas/desktop/mate/file_sharing/bluetooth_enabled - /desktop/mate/file_sharing/bluetooth_enabled - mate-user-share - bool - false - - Share Public directory over Bluetooth - If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in. - - - - /schemas/desktop/mate/file_sharing/bluetooth_allow_write - /desktop/mate/file_sharing/bluetooth_allow_write - mate-user-share - bool - false - - Whether to allow Bluetooth clients to write files. - Whether to allow Bluetooth clients to write files, or share the files read-only. - - - - /schemas/desktop/mate/file_sharing/bluetooth_require_pairing - /desktop/mate/file_sharing/bluetooth_require_pairing - mate-user-share - bool - true - - Whether Bluetooth clients need to pair with the computer to send files. - Whether Bluetooth clients need to pair with the computer to send files. - - - - /schemas/desktop/mate/file_sharing/bluetooth_obexpush_enabled - /desktop/mate/file_sharing/bluetooth_obexpush_enabled - mate-user-share - bool - false - - Whether Bluetooth clients can send files using ObexPush. - If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in. - - - - /schemas/desktop/mate/file_sharing/bluetooth_accept_files - /desktop/mate/file_sharing/bluetooth_accept_files - mate-user-share - string - bonded - - When to accept files sent over Bluetooth - When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask". - - - - /schemas/desktop/mate/file_sharing/bluetooth_notify - /desktop/mate/file_sharing/bluetooth_notify - mate-user-share - bool - false - - Whether to notify about newly received files. - Whether to notify about newly received files. - - - - - diff --git a/data/org.mate.FileSharing.gschema.xml b/data/org.mate.FileSharing.gschema.xml new file mode 100644 index 0000000..4711582 --- /dev/null +++ b/data/org.mate.FileSharing.gschema.xml @@ -0,0 +1,44 @@ + + + + false + Share Public directory over the network + If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in. + + + 'never' + When to require passwords + When to ask for passwords. Possible values are "never", "on_write", and "always". + + + false + Share Public directory over Bluetooth + If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in. + + + false + Whether to allow Bluetooth clients to write files. + Whether to allow Bluetooth clients to write files, or share the files read-only. + + + true + Whether Bluetooth clients need to pair with the computer to send files. + Whether Bluetooth clients need to pair with the computer to send files. + + + false + Whether Bluetooth clients can send files using ObexPush. + If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in. + + + 'bonded' + When to accept files sent over Bluetooth + When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask". + + + false + Whether to notify about newly received files. + Whether to notify about newly received files. + + + -- cgit v1.2.1