gnome-settings-daemon r115 - in trunk: . plugins/a11y-keyboard

[jensg svn gnome org]

Author: jensg
Date: Thu Feb  7 22:30:35 2008
New Revision: 115
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=115&view=rev

Log:
2008-02-07  Jens Granseuer  <jensgr gmx net>

	* plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:
	(gsd_kbd_a11y_error_quark), (gsd_a11y_keyboard_manager_start): make
	sure we return a GError if initialization fails (bug #514926)


Modified:
   trunk/ChangeLog
   trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c

Modified: trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
==============================================================================
--- trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(original)
+++ trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	Thu Feb  7 22:30:35 2008
@@ -58,8 +58,10 @@
         GtkWidget *slowkeys_alert;
 };
 
+#define GSD_KBD_A11Y_ERROR gsd_kbd_a11y_error_quark ()
+
 enum {
-        PROP_0,
+        GSD_KBD_A11Y_ERROR_NOT_AVAILABLE
 };
 
 static void     gsd_a11y_keyboard_manager_class_init  (GsdA11yKeyboardManagerClass *klass);
@@ -77,6 +79,12 @@
 #define d(str)          do { } while (0)
 #endif
 
+static GQuark
+gsd_kbd_a11y_error_quark (void)
+{
+        return g_quark_from_static_string ("gsd-kbd-a11y-error-quark");
+}
+
 static gboolean
 xkb_enabled (GsdA11yKeyboardManager *manager)
 {
@@ -737,6 +745,9 @@
 #endif
 
         if (!xkb_enabled (manager)) {
+                g_set_error (error, GSD_KBD_A11Y_ERROR,
+                             GSD_KBD_A11Y_ERROR_NOT_AVAILABLE,
+                             "XKB functionality is disabled.");
                 return FALSE;
         }