Merge lp:~larsu/appmenu-gtk/lp1026160 into lp:appmenu-gtk/12.10

Proposed by Lars Karlitski
Status: Merged
Approved by: Charles Kerr
Approved revision: 153
Merged at revision: 153
Proposed branch: lp:~larsu/appmenu-gtk/lp1026160
Merge into: lp:appmenu-gtk/12.10
Diff against target: 17 lines (+5/-3)
1 file modified
src/bridge.c (+5/-3)
To merge this branch: bzr merge lp:~larsu/appmenu-gtk/lp1026160
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
jenkins (community) continuous-integration Approve
Review via email:

Commit message

Check for NULL before using GtkMenu.attach-widget

This wasn't a problem before, because GtkMenu didn't notify when it was
detached from its parent widget. This was fixed in gtk with f81bd6c.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

The jenkins failure above is my bad. Should be fixed now.

Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bridge.c'
2--- src/bridge.c 2012-04-02 19:12:37 +0000
3+++ src/bridge.c 2012-07-18 16:37:22 +0000
4@@ -822,9 +822,11 @@
6 g_object_get (widget, "attach-widget", &attach, NULL);
8- rebuild (bridge, attach);
10- g_clear_object (&attach);
11+ if (attach != NULL)
12+ {
13+ rebuild (bridge, attach);
14+ g_object_unref (attach);
15+ }
16 }
17 }


People subscribed via source and target branches