[gnome-settings-daemon] a11y-keyboard: Clean up xkb_enabled() function

[Bastien Nocera <hadess src gnome org>]

commit bd6e9284e8d9b3f7a10e83b6d323e118b76e257b
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Sep 24 00:52:45 2011 +0100

    a11y-keyboard: Clean up xkb_enabled() function

 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
index 2ca3d3a..de1208a 100644
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
@@ -105,18 +105,20 @@ set_devicepresence_handler (GsdA11yKeyboardManager *manager)
 static gboolean
 xkb_enabled (GsdA11yKeyboardManager *manager)
 {
-        gboolean have_xkb;
         int opcode, errorBase, major, minor;
 
-        have_xkb = XkbQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                                      &opcode,
-                                      &manager->priv->xkbEventBase,
-                                      &errorBase,
-                                      &major,
-                                      &minor)
-                && XkbUseExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor);
+        if (!XkbQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                                &opcode,
+                                &manager->priv->xkbEventBase,
+                                &errorBase,
+                                &major,
+                               &minor))
+                return FALSE;
+
+        if (!XkbUseExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor))
+                return FALSE;
 
-        return have_xkb;
+        return TRUE;
 }
 
 static XkbDescRec *