ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/appmenu-gtk/check-for-null-before-set-local into lp:appmenu-gtk.

Requested reviews:
  Canonical Desktop Experience Team (canonical-dx-team)

-- 
https://code.launchpad.net/~bratsche/appmenu-gtk/check-for-null-before-set-local/+merge/31550
Your team ayatana-commits is subscribed to branch lp:appmenu-gtk.

=== modified file 'src/bridge.c'
--- src/bridge.c	2010-07-30 17:05:39 +0000
+++ src/bridge.c	2010-08-02 15:33:44 +0000
@@ -272,7 +272,8 @@
 
   context->registered = TRUE;
 
-  app_menu_bridge_set_show_local (context->bridge, FALSE);
+  if (context->bridge != NULL)
+    app_menu_bridge_set_show_local (context->bridge, FALSE);
 }
 
 static void
@@ -286,7 +287,12 @@
       GtkWidget *widget = context->window;
 
       if (bridge->priv->appmenuproxy == NULL || bridge->priv->online == FALSE)
-        app_menu_bridge_set_show_local (context->bridge, TRUE);
+        {
+          if (context->bridge != NULL
+            {
+              app_menu_bridge_set_show_local (context->bridge, TRUE);
+            }
+        }
 
       if (!context->registered && context->server != NULL && context->root != NULL && GTK_IS_WINDOW (widget) && bridge->priv->appmenuproxy != NULL)
         {