Merge lp:~larsu/indicator-messages/set-targets into lp:indicator-messages/14.04

Proposed by Lars Karlitski
Status: Merged
Approved by: Lars Karlitski
Approved revision: 401
Merged at revision: 400
Proposed branch: lp:~larsu/indicator-messages/set-targets
Merge into: lp:indicator-messages/14.04
Diff against target: 34 lines (+3/-3)
2 files modified
m4/gcov.m4 (+1/-1)
src/im-phone-menu.c (+2/-2)
To merge this branch: bzr merge lp:~larsu/indicator-messages/set-targets
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Nick Dedekind (community) Approve
Review via email: mp+198957@code.launchpad.net

Description of the change

phone menu: set action targets on source and message menu items

To post a comment you must log in.
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

LGTM
tested and works

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'm4/gcov.m4'
2--- m4/gcov.m4 2012-03-19 18:18:45 +0000
3+++ m4/gcov.m4 2013-12-13 15:43:42 +0000
4@@ -30,7 +30,7 @@
5 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
6 fi
7
8- lcov_version_list="1.6 1.7 1.8 1.9"
9+ lcov_version_list="1.6 1.7 1.8 1.9 1.10"
10 AC_CHECK_PROG(LCOV, lcov, lcov)
11 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
12
13
14=== modified file 'src/im-phone-menu.c'
15--- src/im-phone-menu.c 2013-10-02 10:54:52 +0000
16+++ src/im-phone-menu.c 2013-12-13 15:43:42 +0000
17@@ -186,7 +186,7 @@
18 action_name = g_strconcat (app_id, ".msg.", id, NULL);
19
20 item = g_menu_item_new (title, NULL);
21- g_menu_item_set_action_and_target_value (item, action_name, NULL);
22+ g_menu_item_set_action_and_target_value (item, action_name, g_variant_new_boolean (TRUE));
23
24 g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.messageitem");
25 g_menu_item_set_attribute (item, "x-canonical-message-id", "s", id);
26@@ -256,7 +256,7 @@
27 action_name = g_strconcat (app_id, ".src.", id, NULL);
28
29 item = g_menu_item_new (label, NULL);
30- g_menu_item_set_action_and_target_value (item, action_name, NULL);
31+ g_menu_item_set_action_and_target_value (item, action_name, g_variant_new_boolean (TRUE));
32 g_menu_item_set_attribute (item, "x-canonical-type", "s", "com.canonical.indicator.messages.sourceitem");
33
34 if (iconstr)

Subscribers

People subscribed via source and target branches