aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-07-31 09:55:32 +0200
committerLars Uebernickel <lars.uebernickel@canonical.com>2013-07-31 09:55:32 +0200
commit769affeef08a04881a5a84aa5c2db2caedf70646 (patch)
treea39a73bce70a6ade53989956f00b7190127abc6b
parentd6b66195802d27b1f6e99fc544c14a0035dbaa6c (diff)
downloadayatana-indicator-messages-769affeef08a04881a5a84aa5c2db2caedf70646.tar.gz
ayatana-indicator-messages-769affeef08a04881a5a84aa5c2db2caedf70646.tar.bz2
ayatana-indicator-messages-769affeef08a04881a5a84aa5c2db2caedf70646.zip
Prefix action names with "indicator."
-rw-r--r--src/im-application-list.c2
-rw-r--r--src/im-phone-menu.c6
-rw-r--r--src/messages-service.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c
index 9a673c9..3944f3f 100644
--- a/src/im-application-list.c
+++ b/src/im-application-list.c
@@ -685,7 +685,7 @@ im_application_list_message_added (Application *app,
g_variant_builder_init (&dict_builder, G_VARIANT_TYPE ("a{sv}"));
- prefixed_name = g_strjoin (".", app->id, "msg-actions", id, name, NULL);
+ prefixed_name = g_strjoin (".", "indicator", app->id, "msg-actions", id, name, NULL);
g_variant_builder_add (&dict_builder, "{sv}", "name", g_variant_new_string (prefixed_name));
if (label)
diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c
index 3d5f94d..907749f 100644
--- a/src/im-phone-menu.c
+++ b/src/im-phone-menu.c
@@ -72,7 +72,7 @@ im_phone_menu_update_toplevel (ImPhoneMenu *menu)
g_menu_append_section (menu->toplevel_menu, NULL, G_MENU_MODEL (menu->message_section));
g_menu_append_section (menu->toplevel_menu, NULL, G_MENU_MODEL (menu->source_section));
- item = g_menu_item_new ("Clear All", "remove-all");
+ item = g_menu_item_new ("Clear All", "indicator.remove-all");
g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.button");
g_menu_append_item (menu->toplevel_menu, item);
@@ -173,7 +173,7 @@ im_phone_menu_add_message (ImPhoneMenu *menu,
g_return_if_fail (IM_IS_PHONE_MENU (menu));
g_return_if_fail (app_id);
- action_name = g_strconcat (app_id, ".msg.", id, NULL);
+ action_name = g_strconcat ("indicator.", app_id, ".msg.", id, NULL);
item = g_menu_item_new (title, action_name);
@@ -235,7 +235,7 @@ im_phone_menu_add_source (ImPhoneMenu *menu,
g_return_if_fail (IM_IS_PHONE_MENU (menu));
g_return_if_fail (app_id != NULL);
- action_name = g_strconcat (app_id, ".src.", id, NULL);
+ action_name = g_strconcat ("indicator.", app_id, ".src.", id, NULL);
item = g_menu_item_new (label, action_name);
g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.sourceitem");
diff --git a/src/messages-service.c b/src/messages-service.c
index 5f320fc..94d6d29 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -160,7 +160,7 @@ main (int argc, char ** argv)
menu = im_phone_menu_new ();
toplevel_menu = g_menu_new ();
- root = g_menu_item_new (NULL, "messages");
+ 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_submenu (root, im_phone_menu_get_model (menu));
g_menu_append_item (toplevel_menu, root);