From: Ryan Lortie <desrt@desrt.ca>
Date: Tue, 16 Oct 2012 16:27:12 +0000 (-0400)
Subject: GMenuExporter: allow NULL bus on _name_vanished
X-Git-Tag: 2.35.1~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=212ffcc574d929ca0715960b4f29a4aab909a251;p=platform%2Fupstream%2Fglib.git

GMenuExporter: allow NULL bus on _name_vanished

GBusNameVanishedCallback is called with a NULL GDBusConnection in the
case that the connection has vanished.  We were doing an assert to
verify that it was the same as we had exported the menu on and that
assert was failing.

https://bugzilla.gnome.org/show_bug.cgi?id=685995
---

diff --git a/gio/gmenuexporter.c b/gio/gmenuexporter.c
index e57ad47..8509ffd 100644
--- a/gio/gmenuexporter.c
+++ b/gio/gmenuexporter.c
@@ -556,7 +556,8 @@ g_menu_exporter_name_vanished (GDBusConnection *connection,
 {
   GMenuExporter *exporter = user_data;
 
-  g_assert (exporter->connection == connection);
+  /* connection == NULL when we get called because the connection closed */
+  g_assert (exporter->connection == connection || connection == NULL);
 
   g_hash_table_remove (exporter->remotes, name);
 }