aboutsummaryrefslogtreecommitdiff
path: root/src/im-phone-menu.c
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2013-08-28 12:42:08 +0200
committerLars Uebernickel <lars.uebernickel@canonical.com>2013-08-28 12:42:08 +0200
commitec879e19cd2e24a521ce7fde416807e6da9a26bb (patch)
treebf233dfdd1e355e43a4cb9636d9a1378f132d1a8 /src/im-phone-menu.c
parent6ded3e619d7308b6eda2bf0928b226378b565d1b (diff)
downloadayatana-indicator-messages-ec879e19cd2e24a521ce7fde416807e6da9a26bb.tar.gz
ayatana-indicator-messages-ec879e19cd2e24a521ce7fde416807e6da9a26bb.tar.bz2
ayatana-indicator-messages-ec879e19cd2e24a521ce7fde416807e6da9a26bb.zip
Don't pass ids as detailed action names
Detailed action names are of the form action::target or action(target), so they can't have colons or parens in them. This restriction does not apply to messaging menu ids. Fixes: https://bugs.launchpad.net/bugs/1180302.
Diffstat (limited to 'src/im-phone-menu.c')
-rw-r--r--src/im-phone-menu.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/im-phone-menu.c b/src/im-phone-menu.c
index 0ea6f76..a9c5977 100644
--- a/src/im-phone-menu.c
+++ b/src/im-phone-menu.c
@@ -170,7 +170,8 @@ im_phone_menu_add_message (ImPhoneMenu *menu,
action_name = g_strconcat (app_id, ".msg.", id, NULL);
- item = g_menu_item_new (title, action_name);
+ item = g_menu_item_new (title, NULL);
+ g_menu_item_set_action_and_target_value (item, action_name, NULL);
g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.messageitem");
g_menu_item_set_attribute (item, "x-canonical-message-id", "s", id);
@@ -232,7 +233,8 @@ im_phone_menu_add_source (ImPhoneMenu *menu,
action_name = g_strconcat (app_id, ".src.", id, NULL);
- item = g_menu_item_new (label, action_name);
+ item = g_menu_item_new (label, NULL);
+ g_menu_item_set_action_and_target_value (item, action_name, NULL);
g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.sourceitem");
if (iconstr)