Fork from Ubuntu's indicator-sound.

23 files changed, 101 insertions, 83 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0475ff3..cf17fec 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,6 +7,10 @@ set(HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.h")
 set(SYMBOLS_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.def")
 set(VAPI_PATH "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound-service.vapi")
 
+if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml")
+  add_definisions( -DHAS_UBUNTU_SOUND_SCHEMA )
+endif() 
+
 vapi_gen(accounts-service
     LIBRARY
         accounts-service
@@ -16,7 +20,7 @@ vapi_gen(accounts-service
         /usr/share/gir-1.0/AccountsService-1.0.gir
 )
 
-vala_init(indicator-sound-service
+vala_init(ayatana-indicator-sound-service
   DEPENDS
     accounts-service
   PACKAGES
@@ -35,26 +39,25 @@ vala_init(indicator-sound-service
     --target-glib=${GLIB_2_0_REQUIRED_VERSION}
     --vapidir=${CMAKE_SOURCE_DIR}/vapi/
     --vapidir=.
-    --pkg=url-dispatcher
     --pkg=bus-watcher
 )
 
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   notification.vala
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   info-notification.vala
   DEPENDS
     notification
       volume-control
         options
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   warn-notification.vala
   DEPENDS
     notification
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   service.vala
   DEPENDS
     sound-menu
@@ -71,14 +74,14 @@ vala_add(indicator-sound-service
     accounts-service-user
     accounts-service-access
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   options.vala
   DEPENDS
     volume-control
     volume-control-pulse
     accounts-service-access
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   options-gsettings.vala
   DEPENDS
     options
@@ -86,24 +89,24 @@ vala_add(indicator-sound-service
     volume-control
     accounts-service-access
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   volume-control.vala
   DEPENDS
     options
     volume-control-pulse
     accounts-service-access
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   accounts-service-access.vala
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   volume-control-pulse.vala
   DEPENDS
     accounts-service-access
     options
     volume-control
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   volume-warning.vala
   DEPENDS
     options
@@ -113,7 +116,7 @@ vala_add(indicator-sound-service
     notification
     accounts-service-access
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   volume-warning-pulse.vala
   DEPENDS
     volume-warning
@@ -124,28 +127,40 @@ vala_add(indicator-sound-service
     notification
     accounts-service-access
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   media-player.vala
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   media-player-mpris.vala
   DEPENDS
     media-player
     mpris2-interfaces
 )
-vala_add(indicator-sound-service
-  media-player-user.vala
-  DEPENDS
-    media-player
-    accounts-service-sound-settings
-    greeter-broadcast
-)
-vala_add(indicator-sound-service
+if(URLDISPATCHER_FOUND)
+	vala_add(ayatana-indicator-sound-service
+	  media-player-user.vala
+	  DEPENDS
+	    media-player
+	    accounts-service-sound-settings
+	    greeter-broadcast
+	  OPTIONS
+	    --pkg=url-dispatcher
+	)
+else()
+	vala_add(ayatana-indicator-sound-service
+	  media-player-user.vala
+	  DEPENDS
+	    media-player
+	    accounts-service-sound-settings
+	    greeter-broadcast
+	)
+endif()
+vala_add(ayatana-indicator-sound-service
   media-player-list.vala
   DEPENDS
     media-player
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   media-player-list-mpris.vala
   DEPENDS
     media-player-list
@@ -153,20 +168,20 @@ vala_add(indicator-sound-service
     media-player-mpris
     mpris2-interfaces
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   media-player-list-greeter.vala
   DEPENDS
     media-player-list
     media-player-user
     media-player
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   mpris2-interfaces.vala
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   freedesktop-interfaces.vala
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   sound-menu.vala
   DEPENDS
     media-player
@@ -175,7 +190,7 @@ vala_add(indicator-sound-service
     volume-control-pulse
     accounts-service-access
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   accounts-service-user.vala
   DEPENDS
     media-player
@@ -185,20 +200,20 @@ vala_add(indicator-sound-service
     accounts-service-system-sound-settings
     greeter-broadcast
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   accounts-service-sound-settings.vala
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   accounts-service-privacy-settings.vala
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   accounts-service-system-sound-settings.vala
 )
-vala_add(indicator-sound-service
+vala_add(ayatana-indicator-sound-service
   greeter-broadcast.vala
 )
 
-vala_finish(indicator-sound-service
+vala_finish(ayatana-indicator-sound-service
   SOURCES
     project_VALA_SOURCES
   OUTPUTS
@@ -231,7 +246,7 @@ set(
 
 add_definitions(
   -w
-  -DG_LOG_DOMAIN="indicator-sound"
+  -DG_LOG_DOMAIN="ayatana-indicator-sound"
 )
 
 add_library(
@@ -259,7 +274,7 @@ add_executable(
 set_target_properties(
   indicator-sound-service-bin
   PROPERTIES
-  OUTPUT_NAME "indicator-sound-service"
+  OUTPUT_NAME "ayatana-indicator-sound-service"
 )
 
 target_link_libraries(
@@ -274,10 +289,12 @@ target_link_libraries(
 
 install(
   TARGETS indicator-sound-service-bin
-  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/
+  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/ayatana-indicator-sound/
 )
 
+if(UNITY_API_FOUND)
 add_subdirectory(gmenuharness)
+endif()
 
 # coverage reporting
 set(COVERAGE_TARGETS
diff --git a/src/accounts-service-access.vala b/src/accounts-service-access.vala
index 2c73922..9d8b6ae 100644
--- a/src/accounts-service-access.vala
+++ b/src/accounts-service-access.vala
@@ -22,7 +22,7 @@ using PulseAudio;
 using Notify;
 using Gee;
 
-[DBus (name="com.canonical.UnityGreeter.List")]
+[DBus (name="org.ayatana.Greeter.List")]
 interface GreeterListInterfaceAccess : Object
 {
 	public abstract async string get_active_entry () throws IOError;
@@ -178,7 +178,7 @@ public class AccountsServiceAccess : Object
 	{
 		if (Environment.get_variable ("XDG_SESSION_CLASS") == "greeter") {
 			try {
-				_greeter_proxy = yield Bus.get_proxy (BusType.SESSION, "com.canonical.UnityGreeter", "/list");
+				_greeter_proxy = yield Bus.get_proxy (BusType.SESSION, "org.ayatana.Greeter", "/list");
 			} catch (GLib.Error e) {
 				warning ("unable to get greeter proxy: %s", e.message);
 				return;
@@ -231,5 +231,3 @@ public class AccountsServiceAccess : Object
 		}
 	}
 }
-
-
diff --git a/src/accounts-service-privacy-settings.vala b/src/accounts-service-privacy-settings.vala
index ef5c309..cf6b267 100644
--- a/src/accounts-service-privacy-settings.vala
+++ b/src/accounts-service-privacy-settings.vala
@@ -23,4 +23,3 @@ public interface AccountsServicePrivacySettings : Object {
 	public abstract bool stats_welcome_screen {owned get; set;}
 	public abstract bool messages_welcome_screen {owned get; set;}
 }
-
diff --git a/src/accounts-service-sound-settings.vala b/src/accounts-service-sound-settings.vala
index 7e27bd5..8d81912 100644
--- a/src/accounts-service-sound-settings.vala
+++ b/src/accounts-service-sound-settings.vala
@@ -17,7 +17,7 @@
  *      Ted Gould <ted@canonical.com>
  */
 
-[DBus (name = "com.canonical.indicator.sound.AccountsService")]
+[DBus (name = "org.ayatana.indicator.sound.AccountsService")]
 public interface AccountsServiceSoundSettings : Object {
 	// properties
 	public abstract uint64 timestamp {owned get; set;}
@@ -30,4 +30,3 @@ public interface AccountsServiceSoundSettings : Object {
 	public abstract string album {owned get; set;}
 	public abstract string art_url {owned get; set;}
 }
-
diff --git a/src/accounts-service-system-sound-settings.vala b/src/accounts-service-system-sound-settings.vala
index 283a606..3b01561 100644
--- a/src/accounts-service-system-sound-settings.vala
+++ b/src/accounts-service-system-sound-settings.vala
@@ -22,4 +22,3 @@ public interface AccountsServiceSystemSoundSettings : Object {
 	// properties 
 	public abstract bool silent_mode {owned get; set;}
 }
-
diff --git a/src/accounts-service-user.vala b/src/accounts-service-user.vala
index 1f9dcce..535f6c7 100644
--- a/src/accounts-service-user.vala
+++ b/src/accounts-service-user.vala
@@ -121,8 +121,8 @@ public class AccountsServiceUser : Object {
 
 		Bus.get_proxy.begin<GreeterBroadcast> (
 			BusType.SYSTEM,
-			"com.canonical.Unity.Greeter.Broadcast",
-			"/com/canonical/Unity/Greeter/Broadcast",
+			"org.ayatana.Desktop.Greeter.Broadcast",
+			"/org/ayatana/Desktop/Greeter/Broadcast",
 			DBusProxyFlags.NONE,
 			null,
 			greeter_proxy_new);
diff --git a/src/freedesktop-interfaces.vala b/src/freedesktop-interfaces.vala
index 4d75044..b74f52b 100644
--- a/src/freedesktop-interfaces.vala
+++ b/src/freedesktop-interfaces.vala
@@ -43,5 +43,3 @@ public errordomain XmlError {
 
 const string FREEDESKTOP_SERVICE = "org.freedesktop.DBus";
 const string FREEDESKTOP_OBJECT = "/org/freedesktop/DBus";
-
-
diff --git a/src/gmenuharness/CMakeLists.txt b/src/gmenuharness/CMakeLists.txt
index ca9d4dc..761949b 100644
--- a/src/gmenuharness/CMakeLists.txt
+++ b/src/gmenuharness/CMakeLists.txt
@@ -1,4 +1,3 @@
-pkg_check_modules(UNITY_API libunity-api>=0.1.3 REQUIRED)
 include_directories(${UNITY_API_INCLUDE_DIRS})
 
 include_directories("${CMAKE_SOURCE_DIR}/include")
diff --git a/src/gmenuharness/MatchResult.cpp b/src/gmenuharness/MatchResult.cpp
index 40629aa..158e1fd 100644
--- a/src/gmenuharness/MatchResult.cpp
+++ b/src/gmenuharness/MatchResult.cpp
@@ -16,7 +16,7 @@
  * Authored by: Pete Woods <pete.woods@canonical.com>
  */
 
-#include <unity/gmenuharness/MatchResult.h>
+#include <desktop/gmenuharness/MatchResult.h>
 
 #include <chrono>
 #include <map>
diff --git a/src/gmenuharness/MatchUtils.cpp b/src/gmenuharness/MatchUtils.cpp
index 7b87a25..1eeaf52 100644
--- a/src/gmenuharness/MatchUtils.cpp
+++ b/src/gmenuharness/MatchUtils.cpp
@@ -16,9 +16,9 @@
  * Authored by: Pete Woods <pete.woods@canonical.com>
  */
 
-#include <unity/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MatchUtils.h>
 
-#include <unity/util/ResourcePtr.h>
+#include <desktop/util/ResourcePtr.h>
 
 using namespace std;
 namespace util = unity::util;
diff --git a/src/gmenuharness/MenuItemMatcher.cpp b/src/gmenuharness/MenuItemMatcher.cpp
index f39acef..4e9f98e 100644
--- a/src/gmenuharness/MenuItemMatcher.cpp
+++ b/src/gmenuharness/MenuItemMatcher.cpp
@@ -16,9 +16,9 @@
  * Authored by: Pete Woods <pete.woods@canonical.com>
  */
 
-#include <unity/gmenuharness/MatchResult.h>
-#include <unity/gmenuharness/MatchUtils.h>
-#include <unity/gmenuharness/MenuItemMatcher.h>
+#include <desktop/gmenuharness/MatchResult.h>
+#include <desktop/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MenuItemMatcher.h>
 
 #include <iostream>
 #include <vector>
diff --git a/src/gmenuharness/MenuMatcher.cpp b/src/gmenuharness/MenuMatcher.cpp
index 5bb4fbd..7b32068 100644
--- a/src/gmenuharness/MenuMatcher.cpp
+++ b/src/gmenuharness/MenuMatcher.cpp
@@ -16,8 +16,8 @@
  * Authored by: Pete Woods <pete.woods@canonical.com>
  */
 
-#include <unity/gmenuharness/MenuMatcher.h>
-#include <unity/gmenuharness/MatchUtils.h>
+#include <desktop/gmenuharness/MenuMatcher.h>
+#include <desktop/gmenuharness/MatchUtils.h>
 
 #include <iostream>
 
diff --git a/src/greeter-broadcast.vala b/src/greeter-broadcast.vala
index f3d380e..41caed8 100644
--- a/src/greeter-broadcast.vala
+++ b/src/greeter-broadcast.vala
@@ -17,7 +17,7 @@
  *      Ted Gould <ted@canonical.com>
  */
 
-[DBus (name = "com.canonical.Unity.Greeter.Broadcast")]
+[DBus (name = "org.ayatana.Desktop.Greeter.Broadcast")]
 public interface GreeterBroadcast : Object {
   // methods
   // unused public abstract async void RequestApplicationStart(string name, string appid) throws IOError;
diff --git a/src/info-notification.vala b/src/info-notification.vala
index 2ce8ef6..84987dc 100644
--- a/src/info-notification.vala
+++ b/src/info-notification.vala
@@ -120,4 +120,3 @@ public class IndicatorSound.InfoNotification: Notification
 		}
 	}
 }
-
diff --git a/src/main.c b/src/main.c
index 43e330d..b468481 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,10 +90,10 @@ main (int argc, char ** argv)
     g_unix_signal_add(SIGTERM, sigterm_handler, loop);
 
     /* Initialize libnotify */
-    notify_init ("indicator-sound");
+    notify_init ("ayatana-indicator-sound");
 
     g_bus_own_name(G_BUS_TYPE_SESSION,
-        "com.canonical.indicator.sound",
+        "org.ayatana.indicator.sound",
         G_BUS_NAME_OWNER_FLAGS_NONE,
         on_bus_acquired,
         NULL, /* name acquired */
@@ -110,4 +110,3 @@ main (int argc, char ** argv)
 
     return 0;
 }
-
diff --git a/src/media-player-list-greeter.vala b/src/media-player-list-greeter.vala
index 3059946..6cd5c3f 100644
--- a/src/media-player-list-greeter.vala
+++ b/src/media-player-list-greeter.vala
@@ -17,21 +17,21 @@
  *      Ted Gould <ted@canonical.com>
  */
 
-[DBus (name="com.canonical.UnityGreeter.List")]
-public interface UnityGreeterList : Object {
+[DBus (name="org.ayatana.Greeter.List")]
+public interface AyatanaGreeterList : Object {
 	public abstract async string get_active_entry () throws IOError;
 	public signal void entry_selected (string entry_name);
 }
 
 public class MediaPlayerListGreeter : MediaPlayerList {
 	string? selected_user = null;
-	UnityGreeterList? proxy = null;
+	AyatanaGreeterList? proxy = null;
 	HashTable<string, MediaPlayerUser> players = new HashTable<string, MediaPlayerUser>(str_hash, str_equal);
 
 	public MediaPlayerListGreeter () {
-		Bus.get_proxy.begin<UnityGreeterList> (
+		Bus.get_proxy.begin<AyatanaGreeterList> (
 			BusType.SESSION,
-			"com.canonical.UnityGreeter",
+			"org.ayatana.Greeter",
 			"/list",
 			DBusProxyFlags.NONE,
 			null,
@@ -45,7 +45,7 @@ public class MediaPlayerListGreeter : MediaPlayerList {
 			this.proxy.entry_selected.connect(active_user_changed);
 			this.proxy.get_active_entry.begin ((obj, res) => {
 				try {
-					var value = (obj as UnityGreeterList).get_active_entry.end(res);
+					var value = (obj as AyatanaGreeterList).get_active_entry.end(res);
 					active_user_changed(value);
 				} catch (Error e) {
 					warning("Unable to get active entry: %s", e.message);
diff --git a/src/media-player-user.vala b/src/media-player-user.vala
index 1be1a18..0071b93 100644
--- a/src/media-player-user.vala
+++ b/src/media-player-user.vala
@@ -49,8 +49,8 @@ public class MediaPlayerUser : MediaPlayer {
 
 		Bus.get_proxy.begin<GreeterBroadcast> (
 			BusType.SYSTEM,
-			"com.canonical.Unity.Greeter.Broadcast",
-			"/com/canonical/Unity/Greeter/Broadcast",
+			"org.ayatana.Desktop.Greeter.Broadcast",
+			"/org/ayatana/Desktop/Greeter/Broadcast",
 			DBusProxyFlags.NONE,
 			null,
 			greeter_proxy_new);
diff --git a/src/options-gsettings.vala b/src/options-gsettings.vala
index 85fdc66..39d3c83 100644
--- a/src/options-gsettings.vala
+++ b/src/options-gsettings.vala
@@ -30,9 +30,12 @@ public class IndicatorSound.OptionsGSettings : Options
 	~OptionsGSettings() {
 	}
 
-        private Settings _settings = new Settings ("com.canonical.indicator.sound");
+        private Settings _settings = new Settings ("org.ayatana.indicator.sound");
+#if HAS_UBUNTU_SOUND_SETTINGS
         private Settings _shared_settings = new Settings ("com.ubuntu.sound");
-
+#else
+        private Settings _shared_settings = new Settings ("org.ayatana.sound");
+#endif
         /** MAX VOLUME PROPERTY **/
 
 	private static const string AMP_dB_KEY = "amplified-volume-decibels";
diff --git a/src/service.vala b/src/service.vala
index 74c3fc5..4e7d5e9 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -42,7 +42,7 @@ public class IndicatorSound.Service: Object {
 			this.update_notification();
 		});
 
-		this.settings = new Settings ("com.canonical.indicator.sound");
+		this.settings = new Settings ("org.ayatana.indicator.sound");
 
 		this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET);
 		this.notify["visible"].connect ( () => this.update_root_icon () );
@@ -145,12 +145,12 @@ public class IndicatorSound.Service: Object {
 
 		/* Everything is built, let's put it on the bus */
 		try {
-			export_actions = bus.export_action_group ("/com/canonical/indicator/sound", this.actions);
+			export_actions = bus.export_action_group ("/org/ayatana/indicator/sound", this.actions);
 		} catch (Error e) {
 			critical ("%s", e.message);
 		}
 
-		this.menus.@foreach ( (profile, menu) => menu.export (bus, @"/com/canonical/indicator/sound/$profile"));
+		this.menus.@foreach ( (profile, menu) => menu.export (bus, @"/org/ayatana/indicator/sound/$profile"));
 	}
 
 	~Service() {
@@ -191,7 +191,9 @@ public class IndicatorSound.Service: Object {
 		{ "root", null, null, "@a{sv} {}", null },
 		{ "scroll", activate_scroll_action, "i", null, null },
 		{ "desktop-settings", activate_desktop_settings, null, null, null },
+#if URLDISPATCHER_FOUND
 		{ "phone-settings", activate_phone_settings, null, null, null },
+#endif
 		{ "indicator-shown", null, null, "@b false", null },
 	};
 
@@ -251,13 +253,15 @@ public class IndicatorSound.Service: Object {
 		unowned string env = Environment.get_variable ("DESKTOP_SESSION");
 		string cmd;
 
+#if URLDISPATCHER_FOUND
 		if (Environment.get_variable ("MIR_SOCKET") != null)
 		{
 			UrlDispatch.send ("settings:///system/sound");
 			return;
 		}
+#endif
 
-		if (env == "xubuntu" || env == "ubuntustudio")
+		if (env == "xubuntu" || env == "xfce" || env == "ubuntustudio")
 			cmd = "pavucontrol";
 		else if (env == "mate")
 			cmd = "mate-volume-control";
@@ -273,9 +277,11 @@ public class IndicatorSound.Service: Object {
 		}
 	}
 
+#if URLDISPATCHER_FOUND
 	void activate_phone_settings (SimpleAction action, Variant? param) {
 		UrlDispatch.send ("settings:///system/sound");
 	}
+#endif
 
 	/* Returns a serialized version of @icon_name suited for the panel */
 	static Variant serialize_themed_icon (string icon_name)
diff --git a/src/sound-menu.vala b/src/sound-menu.vala
index 2ef089a..e0a05a1 100644
--- a/src/sound-menu.vala
+++ b/src/sound-menu.vala
@@ -36,7 +36,7 @@ public class SoundMenu: Object
 		PLAYLIST = 2
 	}
 
-	const string PLAYBACK_ITEM_TYPE = "com.canonical.unity.playback-item";
+	const string PLAYBACK_ITEM_TYPE = "org.ayatana.unity.playback-item";
 
 	public SoundMenu (string? settings_action, DisplayFlags flags) {
 		/* A sound menu always has at least two sections: the volume section (this.volume_section)
@@ -50,7 +50,7 @@ public class SoundMenu: Object
 			volume_section.append (_("Mute"), "indicator.mute");
 		if ((flags & DisplayFlags.SHOW_SILENT_MODE) != 0) {
 			var item = new MenuItem(_("Silent Mode"), "indicator.silent-mode");
-			item.set_attribute("x-canonical-type", "s", "com.canonical.indicator.switch");
+			item.set_attribute("x-canonical-type", "s", "org.ayatana.indicator.switch");
 			volume_section.append_item(item);
 		}
 
@@ -67,7 +67,7 @@ public class SoundMenu: Object
 		}
 
 		var root_item = new MenuItem (null, "indicator.root");
-		root_item.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.root");
+		root_item.set_attribute ("x-canonical-type", "s", "org.ayatana.indicator.root");
 		root_item.set_attribute ("x-canonical-scroll-action", "s", "indicator.scroll");
 		root_item.set_attribute ("x-canonical-secondary-action", "s", "indicator.mute");
 		root_item.set_attribute ("submenu-action", "s", "indicator.indicator-shown");
@@ -364,7 +364,7 @@ public class SoundMenu: Object
 			base_action += ".greeter";
 
 		var player_item = new MenuItem (player.name, base_action);
-		player_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.media-player");
+		player_item.set_attribute ("x-canonical-type", "s", "org.ayatana.unity.media-player");
 		if (icon != null)
 			player_item.set_attribute_value ("icon", icon.serialize ());
 		section.append_item (player_item);
@@ -457,7 +457,7 @@ public class SoundMenu: Object
 		var max_icon = new ThemedIcon.with_default_fallbacks (max_icon_name);
 
 		var slider = new MenuItem (label, action);
-		slider.set_attribute ("x-canonical-type", "s", "com.canonical.unity.slider");
+		slider.set_attribute ("x-canonical-type", "s", "org.ayatana.unity.slider");
 		slider.set_attribute_value ("min-icon", min_icon.serialize ());
 		slider.set_attribute_value ("max-icon", max_icon.serialize ());
 		slider.set_attribute ("min-value", "d", min);
diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala
index 653a1bd..15b2cf0 100644
--- a/src/volume-control-pulse.vala
+++ b/src/volume-control-pulse.vala
@@ -514,6 +514,7 @@ public class VolumeControlPulse : VolumeControl
 			this.ready = false;
 		}
 
+                /* FIXME: Ubuntu Settings Daemon specifics */
 		var props = new Proplist ();
 		props.sets (Proplist.PROP_APPLICATION_NAME, "Ubuntu Audio Settings");
 		props.sets (Proplist.PROP_APPLICATION_ID, "com.canonical.settings.sound");
diff --git a/src/volume-warning-pulse.vala b/src/volume-warning-pulse.vala
index 2492cef..f7209ee 100644
--- a/src/volume-warning-pulse.vala
+++ b/src/volume-warning-pulse.vala
@@ -195,6 +195,7 @@ public class VolumeWarningPulse : VolumeWarning
 	void pulse_reconnect () {
 		pulse_disconnect ();
 
+		/* FIXME: Unity Settings Daemon specifics */
 		var props = new Proplist ();
 		props.sets (Proplist.PROP_APPLICATION_NAME, "Ubuntu Audio Settings");
 		props.sets (Proplist.PROP_APPLICATION_ID, "com.canonical.settings.sound");
diff --git a/src/volume-warning.vala b/src/volume-warning.vala
index b1cc518..203cb91 100644
--- a/src/volume-warning.vala
+++ b/src/volume-warning.vala
@@ -132,7 +132,7 @@ public abstract class VolumeWarning : Object
 	*** HIGH VOLUME APPROVED PROPERTY
 	**/
 
-	private Settings _settings = new Settings ("com.canonical.indicator.sound");
+	private Settings _settings = new Settings ("org.ayatana.indicator.sound");
 	private static const string TTL_KEY = "warning-volume-confirmation-ttl";
 	private uint _approved_timer = 0;
 	private int64 _approved_at = 0;