registration process in place

4 files changed, 41 insertions, 52 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index aaa6ca4..f33b470 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,43 +1,19 @@
 SUBDIRS = icons
 
+gsettings_SCHEMAS = \
+  com.canonical.indicators.sound.gschema.xml
+@GSETTINGS_RULES@
+
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  indicator-sound.service.in 
-dbus_services_DATA = $(service_in_files:.service.in=.service)
+dbus_services_DATA = indicator-sound.service
 
 %.service: %.service.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-##############################
-# GConf Schema
-##############################
-
-schemadir =					\
-	$(GCONF_SCHEMA_FILE_DIR)
-
-schema_in_files =				\
-	indicator-sound.schemas.in
-
-schema_DATA =					\
-	$(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-
-#$(dbus_services_DATA): $(service_in_files) Makefile
-#	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-
-EXTRA_DIST =					\
-	$(service_in_files)			\
-	$(schema_in_files)
-
-CLEANFILES =					\
-	$(dbus_services_DATA)			\
-	$(schema_DATA)
+EXTRA_DIST = \
+  $(gsettings_SCHEMAS) \
+  indicator-sound.service.in
 
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-		gconftool-2 --makefile-install-rule $(schema_DATA)
-else
-install-data-local:
-endif
+CLEANFILES = \
+  $(dbus_services_DATA)
+  
\ No newline at end of file
diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicators.sound.gschema.xml
new file mode 100644
index 0000000..3850f65
--- /dev/null
+++ b/data/com.canonical.indicators.sound.gschema.xml
@@ -0,0 +1,29 @@
+<schemalist>
+  <schema id="com.canonical.indicators.sound" path="/apps/indicators/sound/" gettext-domain="indicator-sound">
+    <key name="blacklisted-media-players" type="as">
+      <summary>A list of applications blacklisted from the sound menu</summary>
+      <default>[]</default>
+      <description>
+        Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
+        This array should contain the desktop file names (minus .desktop suffix) of applications which
+        do not want to be included in the sound menu.
+      </description>
+    </key>
+    <key name="interested-media-players" type="as">
+      <summary>A list of applications which at some point have registered with the sound menu</summary>
+      <default>[ 'banshee-1' ]</default>
+      <description>
+        Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
+        This array should contain the desktop file names (minus .desktop suffix) of applications which
+        have at some point appeared in the menU. This allows the menu remember and display offlined applications.
+      </description>
+    </key>
+    <key name="global-mute" type="b">
+      <default>false</default>
+      <summary>Initial setting for global mute (mute all) on the menu </summary>
+      <description>
+        On start up volume should not be muted.
+      </description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/indicator-sound.schemas.in b/data/indicator-sound.schemas.in
deleted file mode 100644
index 9ad0f39..0000000
--- a/data/indicator-sound.schemas.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/indicator-sound/volume_mute</key>
-      <applyto>/apps/indicator-sound/volume_mute</applyto>
-      <owner>indicator-sound</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-	<short>Volume is not muted by default</short>
-	<long>On start up volume should not be muted.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in
index 883d31d..a80cd03 100644
--- a/data/indicator-sound.service.in
+++ b/data/indicator-sound.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.ayatana.indicator.sound
+Name=com.canonical.indicators.sound
 Exec=@libexecdir@/indicator-sound-service