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

[Lars Karlitski]

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.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:153
http://s-jenkins:8080/job/appmenu-gtk-ci/2/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/appmenu-gtk-ci/./label=precise-clean-amd64/2/console
    SUCCESS: http://s-jenkins:8080/job/appmenu-gtk-ci/./label=precise-clean-i386/2/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

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

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:153
http://s-jenkins:8080/job/appmenu-gtk-ci/3/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/appmenu-gtk-ci/./label=precise-clean-amd64/3/console
    SUCCESS: http://s-jenkins:8080/job/appmenu-gtk-ci/./label=precise-clean-i386/3/console

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/bridge.c'
--- src/bridge.c	2012-04-02 19:12:37 +0000
+++ src/bridge.c	2012-07-18 16:37:22 +0000
@@ -822,9 +822,11 @@
 
       g_object_get (widget, "attach-widget", &attach, NULL);
 
-      rebuild (bridge, attach);
-
-      g_clear_object (&attach);
+      if (attach != NULL)
+        {
+          rebuild (bridge, attach);
+          g_object_unref (attach);
+        }
     }
 }