gnome-keyring r1376 - in trunk: . common
- From: nnielsen svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-keyring r1376 - in trunk: . common
- Date: Thu, 11 Dec 2008 20:21:47 +0000 (UTC)
Author: nnielsen
Date: Thu Dec 11 20:21:47 2008
New Revision: 1376
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1376&view=rev
Log:
* common/gkr-location.c: Fix crash when empty error message.
Patch by Jeff Cai. Fixes bug #562521
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 Thu Dec 11 20:21:47 2008
@@ -477,7 +477,7 @@
dbus_error_init (&error);
pv->dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
if (dbus_error_is_set (&error)) {
- g_warning ("error connecting to D-BUS system bus: %s", error.message);
+ g_warning ("error connecting to D-BUS system bus: %s", error.message ? error.message : "");
dbus_error_free (&error);
goto failed;
}
@@ -494,7 +494,7 @@
libhal_ctx_set_device_property_modified (pv->hal_ctx, hal_device_property);
if (!libhal_ctx_init (pv->hal_ctx, &error)) {
- g_warning ("failed to initialize a HAL context: %s\n", error.message);
+ g_warning ("failed to initialize a HAL context: %s\n", error.message ? error.message : "");
dbus_error_free (&error);
goto failed;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]