r35978 - in /desktop/experimental/glib2.0/debian: changelog patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Oct 17 10:51:05 2012
New Revision: 35978

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35978
Log:
debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch:
Cherry-pick upstream patch to fix crash when GBusNameVanishedCallback is
called with a NULL GDBusConnection. (LP: #1044322)

Added:
    desktop/experimental/glib2.0/debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35978&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Wed Oct 17 10:51:05 2012
@@ -11,6 +11,9 @@
     + g_settings_bind: use canonical property name
     + Port gio tests from pygobject to pygi
   * Switch python-gobject-2 BD to python-gi, folowing porting of tests. 
+  * debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch:
+    Cherry-pick upstream patch to fix crash when GBusNameVanishedCallback is
+    called with a NULL GDBusConnection. (LP: #1044322)
 
  -- Iain Lane <laney at debian.org>  Tue, 16 Oct 2012 14:46:29 +0100
 

Added: desktop/experimental/glib2.0/debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch?rev=35978&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch [utf-8] Wed Oct 17 10:51:05 2012
@@ -1,0 +1,28 @@
+From 3766b7b5cd0f22d2773c7efc8b52fc2f214d0372 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Tue, 16 Oct 2012 16:27:12 +0000
+Subject: 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);
+ }
+--
+cgit v0.9.0.2

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35978&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Wed Oct 17 10:51:05 2012
@@ -6,6 +6,7 @@
 06_thread_test_ignore_prctl_fail.patch
 07_disable_tests_on_slow_archs.patch
 08_disable_gapplication_basic_test.patch
+50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
 92_revert_appinfo_command_line.patch