Merge lp:~larsu/indicator-messages/lp1081754 into lp:indicator-messages/13.04

Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 333
Merged at revision: 333
Proposed branch: lp:~larsu/indicator-messages/lp1081754
Merge into: lp:indicator-messages/13.04
Diff against target: 12 lines (+1/-1)
1 file modified
libmessaging-menu/messaging-menu.c (+1/-1)
To merge this branch: bzr merge lp:~larsu/indicator-messages/lp1081754
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sebastien Bacher Approve
Review via email: mp+135611@code.launchpad.net

Commit message

libmessaging-menu: fix crash in _draws_attention

The format string passed to g_variant_get calls for four parameters, but only
three were given.

Description of the change

Pass four arguments into g_variant_get when the format string calls for four.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Looks good to me and I've confirmed it's fixing the xchat-gnome segfault

review: Approve
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 'libmessaging-menu/messaging-menu.c'
2--- libmessaging-menu/messaging-menu.c 2012-10-28 14:53:44 +0000
3+++ libmessaging-menu/messaging-menu.c 2012-11-22 08:53:34 +0000
4@@ -715,7 +715,7 @@
5 return;
6
7 state = g_action_get_state (G_ACTION (action));
8- g_variant_get (state, "(ux&sb)", &count, &time, &string);
9+ g_variant_get (state, "(ux&sb)", &count, &time, &string, NULL);
10
11 new_state = g_variant_new ("(uxsb)", count, time, string, TRUE);
12 g_simple_action_set_state (action, new_state);

Subscribers

People subscribed via source and target branches