aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-09-03 13:55:24 -0500
committerTed Gould <ted@gould.cx>2010-09-03 13:55:24 -0500
commit8da28b3879756db8419cad31e589c7448b19ea7c (patch)
tree6b74fd41887da3e3f964c6e64bbbdf068c7b83fd
parente8435163c2483585d11f7e31e95ba9c4d319d8a0 (diff)
parent911d220d42c0bb61caf1a528a353b7a085370c85 (diff)
downloadayatana-indicator-session-8da28b3879756db8419cad31e589c7448b19ea7c.tar.gz
ayatana-indicator-session-8da28b3879756db8419cad31e589c7448b19ea7c.tar.bz2
ayatana-indicator-session-8da28b3879756db8419cad31e589c7448b19ea7c.zip
* Upstream Merge
* Ignoring an invalid error message (LP: #611257)
-rw-r--r--debian/changelog7
-rw-r--r--src/users-service-dbus.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 4416dec..2a87051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-session (0.2.10-0ubuntu1~ppa2) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Ignoring an invalid error message (LP: #611257)
+
+ -- Ted Gould <ted@ubuntu.com> Fri, 03 Sep 2010 13:54:39 -0500
+
indicator-session (0.2.10-0ubuntu1~ppa1) maverick; urgency=low
* New upstream release.
diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c
index 58490de..11ee497 100644
--- a/src/users-service-dbus.c
+++ b/src/users-service-dbus.c
@@ -172,7 +172,7 @@ users_service_dbus_init (UsersServiceDbus *self)
priv->system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
if (error != NULL)
{
- g_error ("Unable to get system bus: %s", error->message);
+ g_error ("Unable to get system bus");
g_error_free(error);
return;