summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-08-03 12:26:32 +0200
committerStefano Karapetsas <[email protected]>2012-08-03 12:26:32 +0200
commit2d7e34441f4d33dc1edb5e9871b66b4977069bae (patch)
treeba425475d77dcca3c86c22b13db0b44ba4912bd9 /data
parent597a9064e4d2df85d53726928e576a9be53d22fb (diff)
downloadmate-notification-daemon-2d7e34441f4d33dc1edb5e9871b66b4977069bae.tar.bz2
mate-notification-daemon-2d7e34441f4d33dc1edb5e9871b66b4977069bae.tar.xz
migrate to GSettings
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am19
-rw-r--r--data/mate-notification-daemon.schemas.in53
-rw-r--r--data/org.mate.NotificationDaemon.gschema.xml24
3 files changed, 27 insertions, 69 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 4a80715..32e1d94 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,21 +16,11 @@ iconscalable_DATA = icons/scalable/mate-notification-properties.svg
servicedir = $(DBUS_SERVICES_DIR)
service_DATA = org.freedesktop.mate.Notifications.service
-schemasdir = $(MATECONF_SCHEMA_FILE_DIR)
-schemas_in_files = mate-notification-daemon.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schemas_DATA)
-else
-install-data-local:
-endif
+gsettings_SCHEMAS = org.mate.NotificationDaemon.gschema.xml
+@GSETTINGS_RULES@
EXTRA_DIST = \
- $(schemas_in_files) \
+ $(gsettings_SCHEMAS) \
$(service_DATA) \
$(icon16_DATA) \
$(icon22_DATA) \
@@ -39,9 +29,6 @@ EXTRA_DIST = \
$(icon48_DATA) \
$(iconscalable_DATA)
-CLEANFILES = $(schemas_DATA)
-
-
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
install-data-hook: update-icon-cache
diff --git a/data/mate-notification-daemon.schemas.in b/data/mate-notification-daemon.schemas.in
deleted file mode 100644
index 117d144..0000000
--- a/data/mate-notification-daemon.schemas.in
+++ /dev/null
@@ -1,53 +0,0 @@
-<mateconfschemafile>
- <schemalist>
-
- <schema>
- <key>/schemas/apps/mate-notification-daemon/popup_location</key>
- <applyto>/apps/mate-notification-daemon/popup_location</applyto>
- <owner>mate-notification-daemon</owner>
- <type>string</type>
- <default>bottom_right</default>
- <locale name="C">
- <short>Popup location</short>
- <long>Default popup location on the workspace for stack notifications. Allowed values: &quot;top_left&quot;,&quot;top_right&quot;,&quot;bottom_left&quot; and &quot;bottom_right&quot;</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/mate-notification-daemon/theme</key>
- <applyto>/apps/mate-notification-daemon/theme</applyto>
- <owner>mate-notification-daemon</owner>
- <type>string</type>
- <default>default</default>
- <locale name="C">
- <short>Current theme</short>
- <long>The theme used when displaying notifications.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/mate-notification-daemon/sound_enabled</key>
- <applyto>/apps/mate-notification-daemon/sound_enabled</applyto>
- <owner>mate-notification-daemon</owner>
- <type>bool</type>
- <default>1</default>
- <locale name="C">
- <short>Sound Enabled</short>
- <long>Turns on and off sound support for notifications.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/mate-notification-daemon/default_sound</key>
- <applyto>/apps/mate-notification-daemon/default_sound</applyto>
- <owner>mate-notification-daemon</owner>
- <type>string</type>
- <default></default>
- <locale name="C">
- <short>Default Sound</short>
- <long>The default sound file used unless a notification supplies the 'sound-file' or 'suppress-sound' hint. Leave empty for no default sound.</long>
- </locale>
- </schema>
-
- </schemalist>
-</mateconfschemafile>
diff --git a/data/org.mate.NotificationDaemon.gschema.xml b/data/org.mate.NotificationDaemon.gschema.xml
new file mode 100644
index 0000000..14c2bd2
--- /dev/null
+++ b/data/org.mate.NotificationDaemon.gschema.xml
@@ -0,0 +1,24 @@
+<schemalist>
+ <schema id="org.mate.NotificationDaemon" path="/org/mate/notification-daemon/">
+ <key name="popup-location" type="s">
+ <default>'bottom_right'</default>
+ <summary>Popup location</summary>
+ <description>Default popup location on the workspace for stack notifications. Allowed values: "top_left","top_right","bottom_left" and "bottom_right"</description>
+ </key>
+ <key name="theme" type="s">
+ <default>'default'</default>
+ <summary>Current theme</summary>
+ <description>The theme used when displaying notifications.</description>
+ </key>
+ <key name="sound-enabled" type="b">
+ <default>true</default>
+ <summary>Sound Enabled</summary>
+ <description>Turns on and off sound support for notifications.</description>
+ </key>
+ <key name="default-sound" type="s">
+ <default>''</default>
+ <summary>Default Sound</summary>
+ <description>The default sound file used unless a notification supplies the 'sound-file' or 'suppress-sound' hint. Leave empty for no default sound.</description>
+ </key>
+ </schema>
+</schemalist>