From 212ffcc574d929ca0715960b4f29a4aab909a251 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Tue, 16 Oct 2012 12:27:12 -0400 Subject: [PATCH] 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 --- gio/gmenuexporter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } -- 2.7.4