convert to gsettings

author: raveit65 <[email protected]> 2012-09-28 12:34:50 +0200
committer: raveit65 <[email protected]> 2012-09-28 12:34:50 +0200
commit: 99c20ca79435c5ab1130258801008b963dd2d098 (patch)
tree: 4fe7aa5c4c35e4bd785ef6e293eea33651195745 /data
parent: 8b06eb18651798d1f02bd358fa43119d914a744f (diff)
download: mate-user-share-99c20ca79435c5ab1130258801008b963dd2d098.tar.bz2
mate-user-share-99c20ca79435c5ab1130258801008b963dd2d098.tar.xz
3 files changed, 47 insertions, 113 deletions
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 @@
-<?xml version="1.0"?>
-<mateconfschemafile>
- <schemalist>
- <schema>
- <key>/schemas/desktop/mate/file_sharing/enabled</key>
- <applyto>/desktop/mate/file_sharing/enabled</applyto>
- <owner>mate-user-share</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Share Public directory over the network</short>
- <long>If this is true, the Public directory in the users home directory will be shared over the network when the user is logged in.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/file_sharing/require_password</key>
- <applyto>/desktop/mate/file_sharing/require_password</applyto>
- <owner>mate-user-share</owner>
- <type>string</type>
- <default>never</default>
- <locale name="C">
- <short>When to require passwords</short>
- <long>When to ask for passwords. Possible values are "never", "on_write", and "always".</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/file_sharing/bluetooth_enabled</key>
- <applyto>/desktop/mate/file_sharing/bluetooth_enabled</applyto>
- <owner>mate-user-share</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Share Public directory over Bluetooth</short>
- <long>If this is true, the Public directory in the users home directory will be shared over Bluetooth when the user is logged in.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/file_sharing/bluetooth_allow_write</key>
- <applyto>/desktop/mate/file_sharing/bluetooth_allow_write</applyto>
- <owner>mate-user-share</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether to allow Bluetooth clients to write files.</short>
- <long>Whether to allow Bluetooth clients to write files, or share the files read-only.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/file_sharing/bluetooth_require_pairing</key>
- <applyto>/desktop/mate/file_sharing/bluetooth_require_pairing</applyto>
- <owner>mate-user-share</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether Bluetooth clients need to pair with the computer to send files.</short>
- <long>Whether Bluetooth clients need to pair with the computer to send files.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/file_sharing/bluetooth_obexpush_enabled</key>
- <applyto>/desktop/mate/file_sharing/bluetooth_obexpush_enabled</applyto>
- <owner>mate-user-share</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether Bluetooth clients can send files using ObexPush.</short>
- <long>If this is true, Bluetooth devices can send files to the user's Downloads directory when logged in.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/file_sharing/bluetooth_accept_files</key>
- <applyto>/desktop/mate/file_sharing/bluetooth_accept_files</applyto>
- <owner>mate-user-share</owner>
- <type>string</type>
- <default>bonded</default>
- <locale name="C">
- <short>When to accept files sent over Bluetooth</short>
- <long>When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask".</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/mate/file_sharing/bluetooth_notify</key>
- <applyto>/desktop/mate/file_sharing/bluetooth_notify</applyto>
- <owner>mate-user-share</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether to notify about newly received files.</short>
- <long>Whether to notify about newly received files.</long>
- </locale>
- </schema>
- </schemalist>
-</mateconfschemafile>
-
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 @@
+<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>
author	raveit65 <[email protected]>	2012-09-28 12:34:50 +0200
committer	raveit65 <[email protected]>	2012-09-28 12:34:50 +0200
commit	99c20ca79435c5ab1130258801008b963dd2d098 (patch)
tree	4fe7aa5c4c35e4bd785ef6e293eea33651195745 /data
parent	8b06eb18651798d1f02bd358fa43119d914a744f (diff)
download	mate-user-share-99c20ca79435c5ab1130258801008b963dd2d098.tar.bz2 mate-user-share-99c20ca79435c5ab1130258801008b963dd2d098.tar.xz