Messaging Menu

Merge lp:~larsu/indicator-messages/unpack-icons-correctly into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

  1. unpack-icons-correctly
  2. Merge into trunk.13.10
Proposed by Lars Karlitski
Status: Merged
Approved by: Ted Gould
Approved revision: 393
Merged at revision: 393
Proposed branch: lp:~larsu/indicator-messages/unpack-icons-correctly
Merge into: lp:~indicator-applet-developers/indicator-messages/trunk.13.10
Diff against target: 12 lines (+1/-1)
1 file modified
src/im-application-list.c (+1/-1)
To merge this branch: bzr merge lp:~larsu/indicator-messages/unpack-icons-correctly
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Gustavo Pichorim Boiko (community) functional test Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+190745@code.launchpad.net

Description of the change

im-application-list: unpack icon correctly

An additional variant was left by unpacking it the old way, which confused g_icon_deserialize() on the menu-rendering side.

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

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-messages-ci/105/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

I tested and it fixes the problem reported.

review: Approve (functional test)
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-application-list.c'
2--- src/im-application-list.c 2013-10-04 13:33:37 +0000
3+++ src/im-application-list.c 2013-10-11 18:59:22 +0000
4@@ -934,7 +934,7 @@
5 &id, &maybe_serialized_icon, &title, &subtitle, &body, &time, &action_iter, &draws_attention);
6
7 if (g_variant_n_children (maybe_serialized_icon) == 1)
8- serialized_icon = g_variant_get_child_value (maybe_serialized_icon, 0);
9+ g_variant_get_child (maybe_serialized_icon, 0, "v", &serialized_icon);
10
11 action = g_simple_action_new (id, G_VARIANT_TYPE_BOOLEAN);
12 g_object_set_qdata(G_OBJECT(action), message_action_draws_attention_quark(), GINT_TO_POINTER(draws_attention));

Subscribers

People subscribed via source and target branches