gnome-keyring r1357 - in trunk: . common

[nnielsen svn gnome org]

Author: nnielsen
Date: Sat Oct 18 16:11:16 2008
New Revision: 1357
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1357&view=rev

Log:
	* common/gkr-location.c: Fix crash on logout on Solaris.
	Fixes bug #556368. Patch by Jeff Cai


Modified:
   trunk/ChangeLog
   trunk/common/gkr-location.c

Modified: trunk/common/gkr-location.c
==============================================================================
--- trunk/common/gkr-location.c	(original)
+++ trunk/common/gkr-location.c	Sat Oct 18 16:11:16 2008
@@ -403,7 +403,7 @@
 		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);
+					g_warning ("failed to shutdown HAL context: %s\n", error.message ? error.message : "");
 					dbus_error_free (&error);
 				}
 				pv->hal_inited = FALSE;