Merge lp:~bratsche/appmenu-gtk/fix-warnings into lp:appmenu-gtk/0.4

[Cody Russell]

[Ted Gould (ted)]

  review approve

On Tue, 2010-07-06 at 14:51 +0000, Cody Russell wrote:
> 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
>
> differences between files attachment (review-diff.txt)
> === 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;
> + }
> }
> }
>
>

review: Approve

=== 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;
+            }
         }
     }