[Xfce4-commits] <xfce4-panel:xfce-4.8> Don't return a critical on a NULL dbus session.

Nick Schermer noreply at xfce.org
Sat Jan 29 21:26:10 CET 2011

Updating branch refs/heads/xfce-4.8
         to 49bc149b475fc5ba6e6e7224437d7b9f0b712337 (commit)
       from 4a3230b22f6cec2549b3ee2ee696b5d8a65ba155 (commit)

commit 49bc149b475fc5ba6e6e7224437d7b9f0b712337
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 23 13:07:32 2011 +0100

    Don't return a critical on a NULL dbus session.
    This way the users gets a normal warning, instead of an abort
    when debugging is enabled.

 panel/panel-dbus-client.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/panel/panel-dbus-client.c b/panel/panel-dbus-client.c
index 3d34935..47add8b 100644
--- a/panel/panel-dbus-client.c
+++ b/panel/panel-dbus-client.c
@@ -57,7 +57,6 @@ panel_dbus_client_get_proxy (GError **error)
   /* return null if no connection is found */
   dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, error);
-  panel_return_val_if_fail (dbus_connection != NULL, NULL);
   if (G_UNLIKELY (dbus_connection == NULL))
     return NULL;

More information about the Xfce4-commits mailing list