Fork from Ubuntu's Indicator Messages.

6 files changed, 20 insertions, 21 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 36e6a93..408d934 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,8 @@
-
 EXTRA_DIST =
 
-pkglibexec_PROGRAMS = indicator-messages-service
+pkglibexec_PROGRAMS = ayatana-indicator-messages-service
 
-indicator_messages_service_SOURCES = \
+ayatana_indicator_messages_service_SOURCES = \
 	messages-service.c \
 	dbus-data.h \
 	gactionmuxer.c \
@@ -23,7 +22,7 @@ indicator_messages_service_SOURCES = \
 	indicator-desktop-shortcuts.c \
 	indicator-desktop-shortcuts.h
 
-indicator_messages_service_CFLAGS = \
+ayatana_indicator_messages_service_CFLAGS = \
 	$(APPLET_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	-I$(top_builddir)/common \
@@ -32,14 +31,14 @@ indicator_messages_service_CFLAGS = \
 	-Wl,-z,defs \
 	-Wl,--as-needed \
 	-Werror -Wno-error=deprecated-declarations \
-	-DG_LOG_DOMAIN=\"Indicator-Messages\"
+	-DG_LOG_DOMAIN=\"Ayatana-Indicator-Messages\"
 
-indicator_messages_service_LDADD = \
+ayatana_indicator_messages_service_LDADD = \
 	$(top_builddir)/common/libmessaging-common.la \
 	$(APPLET_LIBS)
 
-indicator_messages_service_LDFLAGS = \
+ayatana_indicator_messages_service_LDFLAGS = \
 	$(COVERAGE_LDFLAGS)
 
 EXTRA_DIST += \
-	messages-service.xml
+	ayatana-messages-service.xml
diff --git a/src/dbus-data.h b/src/dbus-data.h
index 59bd305..1ac4183 100644
--- a/src/dbus-data.h
+++ b/src/dbus-data.h
@@ -17,10 +17,10 @@
 #ifndef __DBUS_DATA_H__
 #define __DBUS_DATA_H__ 1
 
-#define INDICATOR_MESSAGES_DBUS_NAME               "com.canonical.indicator.messages"
-#define INDICATOR_MESSAGES_DBUS_OBJECT             "/com/canonical/indicator/messages"
+#define INDICATOR_MESSAGES_DBUS_NAME               "org.ayatana.indicator.messages"
+#define INDICATOR_MESSAGES_DBUS_OBJECT             "/org/ayatana/indicator/messages"
 
-#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT     "/com/canonical/indicator/messages/service"
-#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE  "com.canonical.indicator.messages.service"
+#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT     "/org/ayatana/indicator/messages/service"
+#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE  "org.ayatana.indicator.messages.service"
 
 #endif /* __DBUS_DATA_H__ */
diff --git a/src/im-desktop-menu.c b/src/im-desktop-menu.c
index c762735..9c56d6b 100644
--- a/src/im-desktop-menu.c
+++ b/src/im-desktop-menu.c
@@ -114,7 +114,7 @@ im_desktop_menu_app_added (ImApplicationList *applist,
     GVariant *icon;
 
     item = g_menu_item_new (g_app_info_get_name (G_APP_INFO (app_info)), "launch");
-    g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.application");
+    g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.application");
 
     icon = g_icon_serialize (g_app_info_get_icon (G_APP_INFO (app_info)));
     if (icon)
@@ -146,7 +146,7 @@ im_desktop_menu_app_added (ImApplicationList *applist,
 
           label = indicator_desktop_shortcuts_nick_get_name (shortcuts, *nicks);
           item = g_menu_item_new (label, *nicks);
-          g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.application");
+          g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.application");
           g_menu_append_item (app_section, item);
 
           g_free (label);
@@ -209,7 +209,7 @@ im_desktop_menu_source_section_insert_source (GMenu       *source_section,
   action = g_strconcat ("src.", source_id, NULL);
   item = g_menu_item_new (label, NULL);
   g_menu_item_set_action_and_target_value (item, action, NULL);
-  g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.source");
+  g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.source");
   if (serialized_icon)
     g_menu_item_set_attribute_value (item, "icon", serialized_icon);
 
diff --git a/src/im-menu.c b/src/im-menu.c
index 0c39b97..0b98512 100644
--- a/src/im-menu.c
+++ b/src/im-menu.c
@@ -131,7 +131,7 @@ im_menu_init (ImMenu *menu)
   priv->as = im_accounts_service_ref_default();
 
   root = g_menu_item_new (NULL, "indicator.messages");
-  g_menu_item_set_attribute (root, "x-canonical-type", "s", "com.canonical.indicator.root");
+  g_menu_item_set_attribute (root, "x-canonical-type", "s", "org.ayatana.indicator.root");
   g_menu_item_set_attribute (root, "action-namespace", "s", "indicator");
   g_menu_item_set_submenu (root, G_MENU_MODEL (priv->menu));
   g_menu_append_item (priv->toplevel_menu, root);
diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c
index 58a23ff..01d25bb 100644
--- a/src/im-phone-menu.c
+++ b/src/im-phone-menu.c
@@ -74,7 +74,7 @@ im_phone_menu_update_clear_section (ImPhoneMenu *menu)
       GMenuItem *item;
 
       item = g_menu_item_new (_("Clear All"), "remove-all");
-      g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.button");
+      g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.button");
       g_menu_append_item (menu->clear_section, item);
 
       g_object_unref (item);
@@ -191,7 +191,7 @@ im_phone_menu_add_message (ImPhoneMenu     *menu,
   item = g_menu_item_new (title, NULL);
   g_menu_item_set_action_and_target_value (item, action_name, g_variant_new_boolean (TRUE));
 
-  g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.messageitem");
+  g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.messageitem");
   g_menu_item_set_attribute (item, "x-canonical-message-id", "s", id);
   if (show_data)
     g_menu_item_set_attribute (item, "x-canonical-subtitle", "s", subtitle);
@@ -262,7 +262,7 @@ im_phone_menu_add_source (ImPhoneMenu     *menu,
 
   item = g_menu_item_new (label, NULL);
   g_menu_item_set_action_and_target_value (item, action_name, g_variant_new_boolean (TRUE));
-  g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.sourceitem");
+  g_menu_item_set_attribute (item, "x-canonical-type", "s", "org.ayatana.indicator.messages.sourceitem");
 
   if (iconstr)
     g_menu_item_set_attribute (item, "x-canonical-icon", "s", iconstr);
diff --git a/src/messages-service.c b/src/messages-service.c
index d2c7e92..572597c 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -244,7 +244,7 @@ main (int argc, char ** argv)
 	if (argc >= 2 && g_str_equal (argv[1], "--replace"))
 		flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE;
 
-	g_bus_own_name (G_BUS_TYPE_SESSION, "com.canonical.indicator.messages", flags,
+	g_bus_own_name (G_BUS_TYPE_SESSION, "org.ayatana.indicator.messages", flags,
 			on_bus_acquired, NULL, on_name_lost, mainloop, NULL);
 
 	g_signal_connect (messages_service, "handle-register-application",
@@ -260,7 +260,7 @@ main (int argc, char ** argv)
 	g_signal_connect (applications, "status-set",
 			  G_CALLBACK (status_set_by_user), NULL);
 
-	settings = g_settings_new ("com.canonical.indicator.messages");
+	settings = g_settings_new ("org.ayatana.indicator.messages");
 	{
 		gchar **app_ids;
 		gchar **id;