XDG autostart: Adapt previous reverse commit to Ayatana Indicators. Don't start the service in Unity and Pantheon, but launch it in MATE.

5 files changed, 22 insertions, 23 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8a1dd16..a9ebf55 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -76,11 +76,11 @@ install(
 
 set(
   INDICATOR_SOUND_XDG_AUTOSTART
-  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
+  "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-sound.desktop"
 )
 
 configure_file(
-  "indicator-sound.desktop.in"
+  "ayatana-indicator-sound.desktop.in"
   ${INDICATOR_SOUND_XDG_AUTOSTART}
   @ONLY
 )
@@ -96,11 +96,11 @@ install(
 
 set(
   INDICATOR_SOUND_UPSTART_XDG_AUTOSTART
-  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.upstart.desktop"
+  "${CMAKE_CURRENT_BINARY_DIR}/ayatana-indicator-sound.upstart.desktop"
 )
 
 configure_file(
-  "indicator-sound.upstart.desktop.in"
+  "ayatana-indicator-sound.upstart.desktop.in"
   ${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}
   @ONLY
 )
@@ -108,7 +108,7 @@ configure_file(
 install(
   FILES "${INDICATOR_SOUND_UPSTART_XDG_AUTOSTART}"
   DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/xdg/autostart"
-  RENAME "indicator-sound.desktop"
+  RENAME "ayatana-indicator-sound.desktop"
 )
 
 ###########################
diff --git a/data/ayatana-indicator-sound.desktop.in b/data/ayatana-indicator-sound.desktop.in
new file mode 100644
index 0000000..a05ec6f
--- /dev/null
+++ b/data/ayatana-indicator-sound.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Ayatana Indicator Sound
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-sound/ayatana-indicator-sound-service
+OnlyShowIn=MATE;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
diff --git a/data/ayatana-indicator-sound.upstart.desktop.in b/data/ayatana-indicator-sound.upstart.desktop.in
new file mode 100644
index 0000000..87f05c3
--- /dev/null
+++ b/data/ayatana-indicator-sound.upstart.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Ayatana Indicator Sound
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-sound/ayatana-indicator-sound-service
+OnlyShowIn=MATE;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+Hidden=true
diff --git a/data/indicator-sound.desktop.in b/data/indicator-sound.desktop.in
deleted file mode 100644
index 6d31a9a..0000000
--- a/data/indicator-sound.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-OnlyShowIn=Unity;GNOME;Pantheon;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/data/indicator-sound.upstart.desktop.in b/data/indicator-sound.upstart.desktop.in
deleted file mode 100644
index 0380ab8..0000000
--- a/data/indicator-sound.upstart.desktop.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
-OnlyShowIn=Unity;Pantheon;
-NoDisplay=true
-StartupNotify=false
-Terminal=false
-Hidden=true