aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--src/indicator-session.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f7694ef..1166633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-session (0.2.15-0ubuntu2~ppa1) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Don't error and crash Unity (LP: #745323)
+
+ -- Ted Gould <ted@ubuntu.com> Tue, 05 Apr 2011 16:37:38 -0500
+
indicator-session (0.2.15-0ubuntu1) natty; urgency=low
* New upstream release.
diff --git a/src/indicator-session.c b/src/indicator-session.c
index 97e2ce9..e8a2f97 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -162,7 +162,7 @@ service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data)
}
if (error != NULL) {
- g_error("Could not grab DBus proxy for %s: %s", INDICATOR_SESSION_DBUS_NAME, error->message);
+ g_warning("Could not grab DBus proxy for %s: %s", INDICATOR_SESSION_DBUS_NAME, error->message);
g_error_free(error);
return;
}