Merge lp:~ted/appmenu-gtk/unref-if-non-null into lp:appmenu-gtk/0.4

[Ted Gould]

Don't unref the variant if it's NULL (usually error)

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/bridge.c'
--- src/bridge.c	2011-02-03 13:56:08 +0000
+++ src/bridge.c	2011-02-07 15:46:13 +0000
@@ -288,7 +288,12 @@
   AppWindowContext *context = (AppWindowContext *)user_data;
 
   GVariant * variants = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), res, &error);
-  g_variant_unref(variants);
+
+  if (variants != NULL) {
+    /* Only unref variants if we get some.  Doing this hear instead of
+       with the error so that it's clear we don't use it. */
+    g_variant_unref(variants);
+  }
 
   if (error != NULL)
     {