ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/appmenu-gtk/fix-warnings into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)
Related bugs:
  #601077 GLib-GObject-WARNING **: invalid (NULL) pointer instance
  https://bugs.launchpad.net/bugs/601077

-- 
https://code.launchpad.net/~bratsche/appmenu-gtk/fix-warnings/+merge/29300
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-07-03 13:29:10 +0000
+++ src/bridge.c	2010-07-06 14:51:34 +0000
@@ -885,12 +885,15 @@
     {
       context = tmp->data;
 
-      XID xid2 = GDK_WINDOW_XID (gtk_widget_get_window (context->window));
-
-      if (xid == xid2)
+      if (context && GTK_IS_WIDGET (context->window))
         {
-          found = TRUE;
-          break;
+          XID xid2 = GDK_WINDOW_XID (gtk_widget_get_window (context->window));
+
+          if (xid == xid2)
+            {
+              found = TRUE;
+              break;
+            }
         }
     }