gdm r6184 - in trunk: . gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Tue Apr 29 23:04:03 2008
New Revision: 6184
URL: http://svn.gnome.org/viewvc/gdm?rev=6184&view=rev

Log:
2008-04-29  William Jon McCann  <jmccann redhat com>

	* gui/simple-greeter/gdm-greeter-login-window.c: (can_suspend):
	Fix style a bit.



Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-greeter-login-window.c

Modified: trunk/gui/simple-greeter/gdm-greeter-login-window.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-login-window.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-login-window.c	Tue Apr 29 23:04:03 2008
@@ -469,8 +469,9 @@
 {
         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 @@
                                            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