Messaging Menu

Merge lp:~larsu/indicator-messages/dont-use-detailed-action-names into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

  1. dont-use-detailed-action-names
  2. Merge into trunk.13.10
Proposed by Lars Karlitski
Status: Merged
Approved by: Ted Gould
Approved revision: 366
Merged at revision: 369
Proposed branch: lp:~larsu/indicator-messages/dont-use-detailed-action-names
Merge into: lp:~indicator-applet-developers/indicator-messages/trunk.13.10
Diff against target: 23 lines (+4/-2)
1 file modified
src/im-phone-menu.c (+4/-2)
To merge this branch: bzr merge lp:~larsu/indicator-messages/dont-use-detailed-action-names
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+182701@code.launchpad.net

Description of the change

Don't pass source and message ids into parameters that expect detailed action names

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:366
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/87/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-saucy-armhf-ci/40/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-messages-ci/87/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/im-phone-menu.c'
2--- src/im-phone-menu.c 2013-08-20 14:00:35 +0000
3+++ src/im-phone-menu.c 2013-08-28 16:38:35 +0000
4@@ -170,7 +170,8 @@
5
6 action_name = g_strconcat (app_id, ".msg.", id, NULL);
7
8- item = g_menu_item_new (title, action_name);
9+ item = g_menu_item_new (title, NULL);
10+ g_menu_item_set_action_and_target_value (item, action_name, NULL);
11
12 g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.messageitem");
13 g_menu_item_set_attribute (item, "x-canonical-message-id", "s", id);
14@@ -232,7 +233,8 @@
15
16 action_name = g_strconcat (app_id, ".src.", id, NULL);
17
18- item = g_menu_item_new (label, action_name);
19+ item = g_menu_item_new (label, NULL);
20+ g_menu_item_set_action_and_target_value (item, action_name, NULL);
21 g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.sourceitem");
22
23 if (iconstr)

Subscribers

People subscribed via source and target branches