Merge lp:~chrisccoulson/appmenu-gtk/lp733050 into lp:appmenu-gtk/0.4

[Chris Coulson]

Fix LP: #733050 - desktop menu doesn't appear.

- Ensure we initialize the GCancellable when creating a new window context
- Don't try to register a window if the menu service isn't online. It can come online whilst we are in the process of doing the initial registration call (which is doomed, anyway), and this means we never register it properly

=== modified file 'src/bridge.c'
--- src/bridge.c	2011-03-10 13:34:55 +0000
+++ src/bridge.c	2011-04-12 14:41:17 +0000
@@ -352,6 +352,7 @@
             {
               app_menu_bridge_set_show_local (context->bridge, TRUE);
             }
+          continue;
         }
 
       if (!context->registered && context->server != NULL &&
@@ -661,6 +662,7 @@
     {
       context = g_new0 (AppWindowContext, 1);
       context->bridge = bridge;
+      context->cancel = NULL;
       bridge->priv->windows = g_list_prepend (bridge->priv->windows, context);
     }