Updating branch refs/heads/master to 3515a7bbc2403bcc972e8f11314de99d6cd92e2b (commit) from 1b21ed4a608109b16aad100e9759a96815d4e162 (commit)
commit 3515a7bbc2403bcc972e8f11314de99d6cd92e2b Author: Nick Schermer <n...@xfce.org> Date: Fri Mar 30 23:28:15 2012 +0200 Make common no-reply error more subtile. xfce4-session/xfsm-upower.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xfce4-session/xfsm-upower.c b/xfce4-session/xfsm-upower.c index b1491ab..57402ec 100644 --- a/xfce4-session/xfsm-upower.c +++ b/xfce4-session/xfsm-upower.c @@ -249,10 +249,12 @@ xfsm_upower_try_method_cb (DBusGProxy *proxy, if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID, G_TYPE_INVALID)) { - g_warning ("Failed to suspend the system: %s %d %s", - g_quark_to_string (error->domain), - error->code, error->message); - g_error_free (error); + if (g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) + g_message ("Reply after suspend/hibernate timed out. Continuing..."); + else + g_warning ("Failed to suspend the system: %s", error->message); + + g_error_free (error); } } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits