Switch over from Ubuntu System Indicator to Ayatana System Indicator.

4 files changed, 16 insertions, 16 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3a47f8e..245b0f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-pkglibexec_PROGRAMS = indicator-bluetooth-service
+pkglibexec_PROGRAMS = ayatana-indicator-bluetooth-service
 
-indicator_bluetooth_service_SOURCES = \
+ayatana_indicator_bluetooth_service_SOURCES = \
 	bluetooth.vala \
 	bluez.vala \
 	desktop.vala \
@@ -11,7 +11,7 @@ indicator_bluetooth_service_SOURCES = \
 	killswitch.vala \
 	service.vala
 
-indicator_bluetooth_service_VALAFLAGS = \
+ayatana_indicator_bluetooth_service_VALAFLAGS = \
 	--ccode \
 	--vapidir=$(top_srcdir)/vapi/ \
 	--vapidir=./ \
@@ -23,13 +23,13 @@ indicator_bluetooth_service_VALAFLAGS = \
 	--pkg gio-2.0
 
 # -w to disable warnings for vala-generated code
-indicator_bluetooth_service_CFLAGS = \
+ayatana_indicator_bluetooth_service_CFLAGS = \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-DLOCALE_DIR=\"$(datadir)/locale\" \
 	-w \
 	$(SERVICE_DEPS_CFLAGS)
 
-indicator_bluetooth_service_LDADD = \
+ayatana_indicator_bluetooth_service_LDADD = \
 	$(SERVICE_DEPS_LIBS)
 
 CLEANFILES = \
diff --git a/src/desktop.vala b/src/desktop.vala
index 5adaaf1..4186daa 100644
--- a/src/desktop.vala
+++ b/src/desktop.vala
@@ -47,7 +47,7 @@ class Desktop: Profile
 
     connect_actions = new HashTable<uint,SimpleAction>(direct_hash, direct_equal);
 
-    settings = new Settings ("com.canonical.indicator.bluetooth");
+    settings = new Settings ("org.ayatana.indicator.bluetooth");
 
     // build the static actions
     Action[] actions = {};
@@ -94,8 +94,8 @@ class Desktop: Profile
     var action_name = @"desktop-device-$(id)-connected";
 
     var item = new MenuItem (_("Connection"), @"indicator.$action_name");
-    item.set_attribute ("x-canonical-type",
-                        "s", "com.canonical.indicator.switch");
+    item.set_attribute ("x-ayatana-type",
+                        "s", "org.ayatana.indicator.switch");
 
     // if this doesn't already have an action, create one
     if (!connect_actions.contains (id))
@@ -190,8 +190,8 @@ class Desktop: Profile
     section = new Menu ();
     section.append_item (create_enabled_menuitem ());
     item = new MenuItem (_("Visible"), "indicator.desktop-discoverable");
-    item.set_attribute ("x-canonical-type", "s",
-                        "com.canonical.indicator.switch");
+    item.set_attribute ("x-ayatana-type", "s",
+                        "org.ayatana.indicator.switch");
     section.append_item (item);
     menu.append_section (null, section);
 
diff --git a/src/profile.vala b/src/profile.vala
index 4320ac8..767a5cd 100644
--- a/src/profile.vala
+++ b/src/profile.vala
@@ -88,8 +88,8 @@ class Profile: Object
   {
     var item = new MenuItem (_("Bluetooth"), "indicator.bluetooth-enabled");
 
-    item.set_attribute ("x-canonical-type", "s",
-                        "com.canonical.indicator.switch");
+    item.set_attribute ("x-ayatana-type", "s",
+                        "org.ayatana.indicator.switch");
 
     return item;
   }
@@ -98,8 +98,8 @@ class Profile: Object
   {
     var item = new MenuItem (null, @"indicator.root-$profile_name");
 
-    item.set_attribute ("x-canonical-type", "s",
-                        "com.canonical.indicator.root");
+    item.set_attribute ("x-ayatana-type", "s",
+                        "org.ayatana.indicator.root");
 
     return item;
   }
diff --git a/src/service.vala b/src/service.vala
index 20fdd1e..4df3590 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -29,7 +29,7 @@ public class Service: Object
   private HashTable<string,Profile> profiles;
   private DBusConnection connection;
   private uint exported_action_id;
-  private const string OBJECT_PATH = "/com/canonical/indicator/bluetooth";
+  private const string OBJECT_PATH = "/org/ayatana/indicator/bluetooth";
 
   private void unexport ()
   {
@@ -65,7 +65,7 @@ public class Service: Object
       }
 
     var own_name_id = Bus.own_name (BusType.SESSION,
-                                    "com.canonical.indicator.bluetooth",
+                                    "org.ayatana.indicator.bluetooth",
                                     BusNameOwnerFlags.NONE,
                                     on_bus_acquired,
                                     null,