From 8396e05ce716296377f2e4550e0c929dca30518e Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 14 Dec 2010 16:41:10 +0000 Subject: gsettings all the way --- data/Makefile.am | 41 ++++++++----------------- data/com.canonical.indicators.sound.gschema.xml | 20 ++++++++++++ data/indicator-sound.schemas.in | 16 ---------- 3 files changed, 32 insertions(+), 45 deletions(-) create mode 100644 data/com.canonical.indicators.sound.gschema.xml delete mode 100644 data/indicator-sound.schemas.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index aaa6ca4..730f166 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,39 +5,22 @@ service_in_files = indicator-sound.service.in dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ ############################## -# GConf Schema +# GSettings Schema ############################## -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) +gsettings_SCHEMAS = \ + com.canonical.indicators.sound.gschema.xml +@GSETTINGS_RULES@ -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 = \ + $(service_in_files) \ + $(gsettings_SCHEMAS) -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..4284527 --- /dev/null +++ b/data/com.canonical.indicators.sound.gschema.xml @@ -0,0 +1,20 @@ + + + + + A list of applications blacklisted from the sound menu + + 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. + + + + FALSE + Initial setting for global mute (mute all) on the menu + + On start up volume should not be muted. + + + + 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 @@ - - - - - /schemas/apps/indicator-sound/volume_mute - /apps/indicator-sound/volume_mute - indicator-sound - bool - FALSE - - Volume is not muted by default - On start up volume should not be muted. - - - - -- cgit v1.2.3 From 7ef502c18c6ccf850c83fabebfb1884c458320b4 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 14 Dec 2010 17:04:46 +0000 Subject: autofoo in order for gsettings --- data/Makefile.am | 24 +++++++++--------------- data/indicator-sound.service.in | 2 ++ 2 files changed, 11 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 730f166..3f54f64 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,26 +1,20 @@ 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)|" $< > $@ -############################## -# GSettings Schema -############################## - -gsettings_SCHEMAS = \ - com.canonical.indicators.sound.gschema.xml -@GSETTINGS_RULES@ - -############################## -EXTRA_DIST = \ - $(service_in_files) \ - $(gsettings_SCHEMAS) +EXTRA_DIST = \ + $(gsettings_SCHEMAS) \ + indicator-sound.service.in -CLEANFILES = \ +CLEANFILES = \ $(dbus_services_DATA) \ No newline at end of file diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in index 883d31d..7a957cb 100644 --- a/data/indicator-sound.service.in +++ b/data/indicator-sound.service.in @@ -1,3 +1,5 @@ [D-BUS Service] Name=org.ayatana.indicator.sound Exec=@libexecdir@/indicator-sound-service + + -- cgit v1.2.3 From 37eb76fbc08dad63341a4deff3bcaf433e1082ab Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 14 Dec 2010 17:29:49 +0000 Subject: added glib macro necessaries to configure.ac --- data/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 3f54f64..6f2ac61 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,7 +10,6 @@ dbus_services_DATA = indicator-sound.service %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - EXTRA_DIST = \ $(gsettings_SCHEMAS) \ indicator-sound.service.in -- cgit v1.2.3 From 7e7fa1765dc095f441d7290f50c5a773ba531b02 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 14 Dec 2010 17:53:47 +0000 Subject: changed the name of the dbus address to be used between the indicator and service --- data/indicator-sound.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in index 7a957cb..8059216 100644 --- a/data/indicator-sound.service.in +++ b/data/indicator-sound.service.in @@ -1,5 +1,5 @@ [D-BUS Service] -Name=org.ayatana.indicator.sound +Name=com.canonical.indicators.sound Exec=@libexecdir@/indicator-sound-service -- cgit v1.2.3 From 02b6109a523fdf2236788628447186682a9adf1b Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 14 Dec 2010 18:00:36 +0000 Subject: fixed annoying autofoo issues --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 6f2ac61..f33b470 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,7 +8,7 @@ dbus_servicesdir = $(DBUSSERVICEDIR) dbus_services_DATA = indicator-sound.service %.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ EXTRA_DIST = \ $(gsettings_SCHEMAS) \ -- cgit v1.2.3 From aaf57407f00aa59df3699794496fd42a731ad7db Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 15 Dec 2010 14:32:27 +0000 Subject: settings schema defined and handling code wrote --- data/com.canonical.indicators.sound.gschema.xml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicators.sound.gschema.xml index 4284527..e8e4c86 100644 --- a/data/com.canonical.indicators.sound.gschema.xml +++ b/data/com.canonical.indicators.sound.gschema.xml @@ -1,19 +1,28 @@ - - + A list of applications blacklisted from the sound menu + [] - 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. + 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. - - FALSE + + A list of applications which at some point have registered with the sound menu + [] + + 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. + + + + false Initial setting for global mute (mute all) on the menu - On start up volume should not be muted. + On start up volume should not be muted. -- cgit v1.2.3 From bb13f9134c42480ada8128cfbd3b19ec2d68865b Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 15 Dec 2010 16:23:15 +0000 Subject: clients properly remembered using gsettings --- data/com.canonical.indicators.sound.gschema.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicators.sound.gschema.xml index e8e4c86..43cc645 100644 --- a/data/com.canonical.indicators.sound.gschema.xml +++ b/data/com.canonical.indicators.sound.gschema.xml @@ -1,5 +1,5 @@ - + A list of applications blacklisted from the sound menu [] -- cgit v1.2.3 From de3ed4111ef50b847e1ba4d6ea06e13f913ba7a0 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Thu, 16 Dec 2010 12:36:43 +0000 Subject: race condtion on playbackstatus accommodated for and dbus names changed over the new canonical naming --- data/com.canonical.indicators.sound.gschema.xml | 2 +- data/indicator-sound.service.in | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'data') diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicators.sound.gschema.xml index 43cc645..3850f65 100644 --- a/data/com.canonical.indicators.sound.gschema.xml +++ b/data/com.canonical.indicators.sound.gschema.xml @@ -11,7 +11,7 @@ A list of applications which at some point have registered with the sound menu - [] + [ 'banshee-1' ] 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 diff --git a/data/indicator-sound.service.in b/data/indicator-sound.service.in index 8059216..a80cd03 100644 --- a/data/indicator-sound.service.in +++ b/data/indicator-sound.service.in @@ -1,5 +1,3 @@ [D-BUS Service] Name=com.canonical.indicators.sound Exec=@libexecdir@/indicator-sound-service - - -- cgit v1.2.3