summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2008-04-29 23:04:03 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2008-04-29 23:04:03 +0000
commitbebadc80949192c5ce99e668f2e643210c0e6df6 (patch)
tree7c76c201e72987e7157e1e50f75e6377e7b34a52
parent736d2e06543bc57763fd2cb85a28206fe8fced7b (diff)
downloadgdm-bebadc80949192c5ce99e668f2e643210c0e6df6.tar.gz
Fix style a bit.
2008-04-29 William Jon McCann <jmccann@redhat.com> * gui/simple-greeter/gdm-greeter-login-window.c: (can_suspend): Fix style a bit. svn path=/trunk/; revision=6184
-rw-r--r--ChangeLog5
-rw-r--r--gui/simple-greeter/gdm-greeter-login-window.c23
2 files changed, 19 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fb3941c..44d1a673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-04-29 William Jon McCann <jmccann@redhat.com>
+ * gui/simple-greeter/gdm-greeter-login-window.c: (can_suspend):
+ Fix style a bit.
+
+2008-04-29 William Jon McCann <jmccann@redhat.com>
+
* daemon/gdm-simple-slave.c: (destroy_session), (reset_session),
(greeter_reset_timeout), (on_session_setup_failed),
(on_session_authentication_failed),
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index 13b0ff48..921025b8 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -469,8 +469,9 @@ can_suspend (GdmGreeterLoginWindow *login_window)
{
DBusGConnection *connection;
DBusGProxy *proxy;
- GError *error;
- gboolean result;
+ GError *error;
+ gboolean ret;
+ gboolean res;
error = NULL;
connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
@@ -483,20 +484,24 @@ can_suspend (GdmGreeterLoginWindow *login_window)
GPM_DBUS_NAME,
GPM_DBUS_PATH,
GPM_DBUS_INTERFACE);
- result = FALSE;
- if (!dbus_g_proxy_call (proxy, "CanSuspend",
- &error,
- G_TYPE_INVALID,
- G_TYPE_BOOLEAN, &result, G_TYPE_INVALID)) {
+ ret = FALSE;
+
+ res = dbus_g_proxy_call (proxy, "CanSuspend",
+ &error,
+ G_TYPE_INVALID,
+ G_TYPE_BOOLEAN,
+ &ret,
+ G_TYPE_INVALID);
+ if (! res) {
if (error != NULL) {
g_warning ("Could not ask power manager if user can suspend: %s",
error->message);
g_error_free (error);
}
- result = FALSE;
+ ret = FALSE;
}
- return result;
+ return ret;
}
static void