gnome-settings-daemon r591 - in trunk: . plugins/keyboard

[behdad svn gnome org]

Author: behdad
Date: Thu Nov  6 03:36:34 2008
New Revision: 591
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=591&view=rev

Log:
2008-11-05  Behdad Esfahbod  <behdad gnome org>

        * plugins/keyboard/gsd-keyboard-manager.c (start_keyboard_idle_cb),
        (gsd_keyboard_manager_start): Start manager in idle callback (bug
        #559482)

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

Modified: trunk/plugins/keyboard/gsd-keyboard-manager.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-manager.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-manager.c	Thu Nov  6 03:36:34 2008
@@ -370,9 +370,8 @@
         gdk_error_trap_pop ();
 }
 
-gboolean
-gsd_keyboard_manager_start (GsdKeyboardManager *manager,
-                            GError            **error)
+static gboolean
+start_keyboard_idle_cb (GsdKeyboardManager *manager)
 {
         GConfClient *client;
 
@@ -408,6 +407,19 @@
 
         gnome_settings_profile_end (NULL);
 
+        return FALSE;
+}
+
+gboolean
+gsd_keyboard_manager_start (GsdKeyboardManager *manager,
+                            GError            **error)
+{
+        gnome_settings_profile_start (NULL);
+
+        g_idle_add ((GSourceFunc) start_keyboard_idle_cb, manager);
+
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }