r17037 - in /desktop/unstable/gnome-keyring/debian: changelog control patches/02_dbus_crash.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Sep 23 10:55:56 2008
New Revision: 17037

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17037
Log:
02_dbus_crash.patch: patch from upstream to fix a crash that happens 
after dbus restarts. Closes: #474418.

Added:
    desktop/unstable/gnome-keyring/debian/patches/02_dbus_crash.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/control

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=17037&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog (original)
+++ desktop/unstable/gnome-keyring/debian/changelog Tue Sep 23 10:55:56 2008
@@ -1,3 +1,10 @@
+gnome-keyring (2.22.3-2) unstable; urgency=low
+
+  * 02_dbus_crash.patch: patch from upstream to fix a crash that happens 
+    after dbus restarts. Closes: #474418.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 23 Sep 2008 12:42:14 +0200
+
 gnome-keyring (2.22.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=17037&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control (original)
+++ desktop/unstable/gnome-keyring/debian/control Tue Sep 23 10:55:56 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ondřej Surý <ondrej at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Norbert Tretkowski <nobse at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Norbert Tretkowski <nobse at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 5),
                gnome-pkg-tools (>= 0.10),
                libgtk2.0-dev (>= 2.6.0),

Added: desktop/unstable/gnome-keyring/debian/patches/02_dbus_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/02_dbus_crash.patch?rev=17037&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/02_dbus_crash.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/02_dbus_crash.patch Tue Sep 23 10:55:56 2008
@@ -1,0 +1,38 @@
+Index: common/gkr-location.c
+===================================================================
+--- common/gkr-location.c	(revision 1189)
++++ common/gkr-location.c	(working copy)
+@@ -70,6 +70,7 @@
+ struct _GkrLocationManagerPrivate {
+ #ifdef WITH_HAL
+ 	LibHalContext *hal_ctx;
++	gboolean hal_inited;
+ 	guint hal_retry;
+ 	DBusConnection *dbus_connection;
+ #endif
+@@ -399,9 +400,14 @@
+ 
+ 	if (pv->hal_ctx) {
+ 		dbus_error_init (&error);
+-		if (pv->dbus_connection != NULL && !libhal_ctx_shutdown (pv->hal_ctx, &error)) {
+-			g_warning ("failed to shutdown HAL context: %s\n", error.message);
+-			dbus_error_free (&error);
++		if (pv->dbus_connection != NULL) {
++			if (pv->hal_inited) {
++				if (libhal_ctx_shutdown (pv->hal_ctx, &error)) {
++					g_warning ("failed to shutdown HAL context: %s\n", error.message);
++					dbus_error_free (&error);
++				}
++				pv->hal_inited = FALSE;
++			}
+ 		} 
+ 		
+ 		if (!libhal_ctx_free (pv->hal_ctx)) 
+@@ -493,6 +499,7 @@
+ 		goto failed;
+ 	}
+ 	
++	pv->hal_inited = TRUE;
+ 	libhal_ctx_set_user_data (pv->hal_ctx, locmgr);
+ 	
+ 	populate_all_volumes (locmgr);