diff options
| author | Ted Gould <ted@gould.cx> | 2013-08-27 10:58:07 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2013-08-27 10:58:07 -0500 |
| commit | 3f3f5915a4ade92a74633e1b4d7dc19822223213 (patch) | |
| tree | 73430e480c436187ea247b2830f3c5c9cb1f6fea /data | |
| parent | f21921053ac8cf50438ff418539cf22d9a86c8bb (diff) | |
| parent | dc721ac25d910a08fc3806330b2f8bd8d3b2a4dd (diff) | |
| download | ayatana-indicator-sound-3f3f5915a4ade92a74633e1b4d7dc19822223213.tar.gz ayatana-indicator-sound-3f3f5915a4ade92a74633e1b4d7dc19822223213.tar.bz2 ayatana-indicator-sound-3f3f5915a4ade92a74633e1b4d7dc19822223213.zip | |
Merge Trunk
Diffstat (limited to 'data')
| -rw-r--r-- | data/CMakeLists.txt | 43 | ||||
| -rw-r--r-- | data/Makefile.am | 20 | ||||
| -rw-r--r-- | data/com.canonical.indicator.sound | 6 | ||||
| -rw-r--r-- | data/com.canonical.indicator.sound.gschema.xml | 2 | ||||
| -rw-r--r-- | data/indicator-sound.conf.in | 2 |
5 files changed, 51 insertions, 22 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 0000000..e71051e --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,43 @@ + +include(UseGSettings) + +########################### +# Indicator service +########################### + +set( + INDICATOR_DIR + "${CMAKE_INSTALL_DATADIR}/unity/indicators" + CACHE FILEPATH "Indicator directory" +) + +install( + FILES "com.canonical.indicator.sound" + DESTINATION "${INDICATOR_DIR}" +) + +########################### +# Dbus Service +########################### + +set( + INDICATOR_SOUND_CONF + "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.conf" +) + +configure_file( + "indicator-sound.conf.in" + ${INDICATOR_SOUND_CONF} + @ONLY +) + +install( + FILES "${INDICATOR_SOUND_CONF}" + DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions/" +) + +########################### +# GSettings +########################### + +add_schema ("com.canonical.indicator.sound.gschema.xml") diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index d71a585..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -gsettings_SCHEMAS = \ - com.canonical.indicator.sound.gschema.xml -@GSETTINGS_RULES@ - -upstart_jobsdir = $(datadir)/upstart/sessions -upstart_jobs_DATA = indicator-sound.conf - -%.conf: %.conf.in - sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ - -indicatordir = $(INDICATOR_DIR) -dist_indicator_DATA = com.canonical.indicator.sound - -EXTRA_DIST = \ - $(gsettings_SCHEMAS) \ - indicator-sound.conf.in - -CLEANFILES = \ - $(dbus_services_DATA) - diff --git a/data/com.canonical.indicator.sound b/data/com.canonical.indicator.sound index 0831462..adefae9 100644 --- a/data/com.canonical.indicator.sound +++ b/data/com.canonical.indicator.sound @@ -5,3 +5,9 @@ Position=30 [desktop] ObjectPath=/com/canonical/indicator/sound/desktop + +[phone] +ObjectPath=/com/canonical/indicator/sound/phone + +[desktop_greeter] +ObjectPath=/com/canonical/indicator/sound/desktop diff --git a/data/com.canonical.indicator.sound.gschema.xml b/data/com.canonical.indicator.sound.gschema.xml index 86de36a..102a1db 100644 --- a/data/com.canonical.indicator.sound.gschema.xml +++ b/data/com.canonical.indicator.sound.gschema.xml @@ -11,7 +11,7 @@ </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>[ 'rhythmbox' ]</default> + <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 diff --git a/data/indicator-sound.conf.in b/data/indicator-sound.conf.in index 73d2a7d..6d5c870 100644 --- a/data/indicator-sound.conf.in +++ b/data/indicator-sound.conf.in @@ -11,4 +11,4 @@ export G_MESSAGES_DEBUG respawn -exec @pkglibexecdir@/indicator-sound-service +exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service |