Import upstream version 0.2.16

4 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a8d8a8..157e4f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 # Generated by Makefile. Do not edit.
 
+2011-04-07  Ted Gould  <ted@gould.cx>
+
+	0.2.16
+
+2011-04-05  Ted Gould  <ted@gould.cx>
+
+	Only warn when not getting the proxy, so we don't bring Unity down
+
+2011-04-04  Ted Gould  <ted@gould.cx>
+
+	Removing a g_error so we don't bring the whole kit-and-kaboodle down.
+
 2011-03-10  Ted Gould  <ted@gould.cx>
 
 	0.2.15
diff --git a/configure b/configure
index e65cc7d..8c5200e 100755
--- a/configure
+++ b/configure
@@ -2882,7 +2882,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.2.15
+ VERSION=0.2.16
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 724831f..f6ef2c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.2.15)
+AM_INIT_AUTOMAKE(indicator-session, 0.2.16)
 
 AM_MAINTAINER_MODE
 
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;
 	}