Fork from Ubuntu's indicator-keyboard.

8 files changed, 18 insertions, 18 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d45b98dd..e458475c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-pkglibexec_PROGRAMS = indicator-keyboard-service
+pkglibexec_PROGRAMS = ayatana-indicator-keyboard-service
 
 AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
 AM_LDFLAGS = -lm
diff --git a/lib/ibus-panel.vala b/lib/ibus-panel.vala
index 460b1eac..2a380efd 100644
--- a/lib/ibus-panel.vala
+++ b/lib/ibus-panel.vala
@@ -16,7 +16,7 @@
  * Authors: William Hua <william.hua@canonical.com>
  */
 
-[DBus (name="com.canonical.IBus.Panel.Private")]
+[DBus (name="org.ayatana.IBus.Panel.Private")]
 public interface IBusPanel : Object {
 
 	public abstract void activate_property (string name, uint state) throws IOError;
diff --git a/lib/indicator-menu.vala b/lib/indicator-menu.vala
index 96bf64d6..2cfa52c6 100644
--- a/lib/indicator-menu.vala
+++ b/lib/indicator-menu.vala
@@ -59,7 +59,7 @@ public class Indicator.Keyboard.IndicatorMenu : MenuModel {
 
 			var indicator = new MenuItem.submenu (null, submenu);
 			indicator.set_detailed_action ("indicator.indicator");
-			indicator.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.root");
+			indicator.set_attribute ("x-canonical-type", "s", "org.ayatana.indicator.root");
 
 			/* We need special mouse actions on the lock screen. */
 			if (Options.DCONF in options) {
diff --git a/lib/keyboard-plugin.vala b/lib/keyboard-plugin.vala
index 5ee8ea24..af1628f6 100644
--- a/lib/keyboard-plugin.vala
+++ b/lib/keyboard-plugin.vala
@@ -16,7 +16,7 @@
  * Authors: William Hua <william.hua@canonical.com>
  */
 
-[DBus (name="com.canonical.SettingsDaemon.Keyboard.Private")]
+[DBus (name="org.ayatana.SettingsDaemon.Keyboard.Private")]
 public interface KeyboardPlugin : Object {
 
 	public abstract void activate_input_source (uint index) throws IOError;
diff --git a/lib/main.vala b/lib/main.vala
index d3e063d1..9bb3eb1f 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -16,7 +16,7 @@
  * Authors: William Hua <william.hua@canonical.com>
  */
 
-[DBus (name = "com.canonical.indicator.keyboard")]
+[DBus (name = "org.ayatana.indicator.keyboard")]
 public class Indicator.Keyboard.Service : Object {
 
 	private static const uint PROPERTIES_DELAY = 250;
@@ -116,21 +116,21 @@ public class Indicator.Keyboard.Service : Object {
 			                handle_keyboard_name_vanished);
 
 			Bus.watch_name (BusType.SESSION,
-			                "com.canonical.Unity",
+			                "org.ayatana.Unity",
 			                BusNameWatcherFlags.NONE,
 			                handle_unity_name_appeared,
 			                handle_unity_name_vanished);
 
 			if (!is_fcitx_active ()) {
 				Bus.watch_name (BusType.SESSION,
-				                "com.canonical.Unity.WindowStack",
+				                "org.ayatana.Unity.WindowStack",
 				                BusNameWatcherFlags.NONE,
 				                handle_window_stack_name_appeared,
 				                handle_window_stack_name_vanished);
 			}
 		}
 
-		indicator_settings = new Settings ("com.canonical.indicator.keyboard");
+		indicator_settings = new Settings ("org.ayatana.indicator.keyboard");
 		indicator_settings.changed["visible"].connect (handle_changed_visible);
 
 		source_settings = new Settings ("org.gnome.desktop.input-sources");
@@ -279,7 +279,7 @@ public class Indicator.Keyboard.Service : Object {
 	[DBus (visible = false)]
 	private void acquire_bus_name () {
 		Bus.own_name (BusType.SESSION,
-		              "com.canonical.indicator.keyboard",
+		              "org.ayatana.indicator.keyboard",
 		              BusNameOwnerFlags.ALLOW_REPLACEMENT | (force ? BusNameOwnerFlags.REPLACE : 0),
 		              handle_bus_acquired,
 		              null,
@@ -1185,7 +1185,7 @@ public class Indicator.Keyboard.Service : Object {
 	[DBus (visible = false)]
 	private void handle_unity_name_appeared (DBusConnection connection, string name, string name_owner) {
 		try {
-			var session = Bus.get_proxy_sync<UnitySession> (BusType.SESSION, name, "/com/canonical/Unity/Session");
+			var session = Bus.get_proxy_sync<UnitySession> (BusType.SESSION, name, "/org/ayatana/Unity/Session");
 
 			session.locked.connect (() => {
 				var sources = get_sources ();
@@ -1221,7 +1221,7 @@ public class Indicator.Keyboard.Service : Object {
 	[DBus (visible = false)]
 	private void handle_window_stack_name_appeared (DBusConnection connection, string name, string name_owner) {
 		try {
-			window_stack = Bus.get_proxy_sync (BusType.SESSION, name, "/com/canonical/Unity/WindowStack");
+			window_stack = Bus.get_proxy_sync (BusType.SESSION, name, "/org/ayatana/Unity/WindowStack");
 			update_window_sources ();
 		} catch (IOError error) {
 			warning ("error: %s", error.message);
@@ -1236,10 +1236,10 @@ public class Indicator.Keyboard.Service : Object {
 	[DBus (visible = false)]
 	private void handle_bus_acquired (DBusConnection connection, string name) {
 		try {
-			connection.export_action_group ("/com/canonical/indicator/keyboard", get_action_group ());
-			connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop", get_desktop_menu ());
-			connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop_greeter", get_desktop_greeter_menu ());
-			connection.export_menu_model ("/com/canonical/indicator/keyboard/desktop_lockscreen", get_desktop_lockscreen_menu ());
+			connection.export_action_group ("/org/ayatana/indicator/keyboard", get_action_group ());
+			connection.export_menu_model ("/org/ayatana/indicator/keyboard/desktop", get_desktop_menu ());
+			connection.export_menu_model ("/org/ayatana/indicator/keyboard/desktop_greeter", get_desktop_greeter_menu ());
+			connection.export_menu_model ("/org/ayatana/indicator/keyboard/desktop_lockscreen", get_desktop_lockscreen_menu ());
 		} catch (Error error) {
 			warning ("error: %s", error.message);
 		}
diff --git a/lib/unity-greeter.vala b/lib/unity-greeter.vala
index 2cdfe05c..5ca398ec 100644
--- a/lib/unity-greeter.vala
+++ b/lib/unity-greeter.vala
@@ -16,7 +16,7 @@
  * Authors: William Hua <william.hua@canonical.com>
  */
 
-[DBus (name="com.canonical.UnityGreeter.List")]
+[DBus (name="org.ayatana.UnityGreeter.List")]
 public interface UnityGreeter : Object {
 
 	public abstract string get_active_entry () throws IOError;
diff --git a/lib/unity-session.vala b/lib/unity-session.vala
index 04bf3349..15337c36 100644
--- a/lib/unity-session.vala
+++ b/lib/unity-session.vala
@@ -16,7 +16,7 @@
  * Authors: William Hua <william.hua@canonical.com>
  */
 
-[DBus (name="com.canonical.Unity.Session")]
+[DBus (name="org.ayatana.Unity.Session")]
 public interface UnitySession : Object {
 
 	public signal void locked ();
diff --git a/lib/window-stack.vala b/lib/window-stack.vala
index 980eba4f..a943da6a 100644
--- a/lib/window-stack.vala
+++ b/lib/window-stack.vala
@@ -24,7 +24,7 @@ public struct WindowInfo {
 	public uint stage;
 }
 
-[DBus (name="com.canonical.Unity.WindowStack")]
+[DBus (name="org.ayatana.Unity.WindowStack")]
 public interface WindowStack : Object {
 
 	public abstract string get_app_id_from_pid (uint pid) throws IOError;