diff --git a/data/gnome-settings-daemon.schemas.in b/data/gnome-settings-daemon.schemas.in

index 3f6a426..9b7d711 100644

--- a/data/gnome-settings-daemon.schemas.in

+++ b/data/gnome-settings-daemon.schemas.in

@@ -41,7 +41,7 @@

       <applyto>/apps/gnome_settings_daemon/plugins/background/priority</applyto>

       <owner>gnome-settings-daemon</owner>

       <type>int</type>

-      <default>5</default>

+      <default>97</default>

       <locale name="C">

         <short></short>

         <long></long>

@@ -64,7 +64,7 @@

       <applyto>/apps/gnome_settings_daemon/plugins/clipboard/priority</applyto>

       <owner>gnome-settings-daemon</owner>

       <type>int</type>

-      <default>100</default>

+      <default>99</default>

       <locale name="C">

         <short></short>

         <long></long>

@@ -179,7 +179,7 @@

       <applyto>/apps/gnome_settings_daemon/plugins/media-keys/priority</applyto>

       <owner>gnome-settings-daemon</owner>

       <type>int</type>

-      <default>20</default>

+      <default>98</default>

       <locale name="C">

         <short></short>

         <long></long>

@@ -306,7 +306,7 @@

       <applyto>/apps/gnome_settings_daemon/plugins/xrdb/active</applyto>

       <owner>gnome-settings-daemon</owner>

       <type>bool</type>

-      <default>TRUE</default>

+      <default>FALSE</default>

       <locale name="C">

         <short>Enable xrdb plugin</short>

         <long>Set to True to enable the plugin to manage xrdb settings.</long>

diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c

index 0bc3f61..475c883 100644

--- a/gnome-settings-daemon/gnome-settings-manager.c

+++ b/gnome-settings-daemon/gnome-settings-manager.c

@@ -49,6 +49,7 @@

 struct GnomeSettingsManagerPrivate

 {

         DBusGConnection            *connection;

+        GConfClient                *gconf_client;

         char                       *settings_prefix;

         GSList                     *plugins;

 };

@@ -157,24 +158,21 @@ _load_file (GnomeSettingsManager *manager,

 {

         GnomeSettingsPluginInfo *info;

         char                    *key_name;

-        GConfClient             *client;

         int                      priority;

         GError                  *error;

         GSList                  *l;

         g_debug ("Loading plugin: %s", filename);

-        gnome_settings_profile_start (NULL);

+        gnome_settings_profile_start ("%s", filename);

         info = gnome_settings_plugin_info_new_from_file (filename);

         if (info == NULL) {

                 goto out;

         }

-        gnome_settings_profile_start ("seeing if already loaded");

         l = g_slist_find_custom (manager->priv->plugins,

                                  info,

                                  (GCompareFunc) compare_location);

-        gnome_settings_profile_end ("seeing if already loaded");

         if (l != NULL) {

                 goto out;

         }

@@ -187,21 +185,17 @@ _load_file (GnomeSettingsManager *manager,

         g_signal_connect (info, "deactivated",

                           G_CALLBACK (on_plugin_deactivated), manager);

-        gnome_settings_profile_start ("setting active property");

         key_name = g_strdup_printf ("%s/%s/active",

                                     manager->priv->settings_prefix,

                                     gnome_settings_plugin_info_get_location (info));

         gnome_settings_plugin_info_set_enabled_key_name (info, key_name);

         g_free (key_name);

-        gnome_settings_profile_end ("setting active property");

-        gnome_settings_profile_start ("setting priority property");

         key_name = g_strdup_printf ("%s/%s/priority",

                                     manager->priv->settings_prefix,

                                     gnome_settings_plugin_info_get_location (info));

-        client = gconf_client_get_default ();

         error = NULL;

-        priority = gconf_client_get_int (client, key_name, &error);

+        priority = gconf_client_get_int (manager->priv->gconf_client, key_name, &error);

         if (error == NULL) {

                 if (priority > 0) {

                         gnome_settings_plugin_info_set_priority (info, priority);

@@ -210,15 +204,13 @@ _load_file (GnomeSettingsManager *manager,

                 g_error_free (error);

         }

         g_free (key_name);

-        g_object_unref (client);

-        gnome_settings_profile_end ("setting priority property");

  out:

         if (info != NULL) {

                 g_object_unref (info);

         }

-        gnome_settings_profile_end (NULL);

+        gnome_settings_profile_end ("%s", filename);

 }

 static void

@@ -345,6 +337,15 @@ gnome_settings_manager_start (GnomeSettingsManager *manager,

                 goto out;

         }

+        manager->priv->gconf_client = gconf_client_get_default ();

+

+        gnome_settings_profile_start ("preloading gconf keys");

+        gconf_client_add_dir (manager->priv->gconf_client,

+                              manager->priv->settings_prefix,

+                              GCONF_CLIENT_PRELOAD_RECURSIVE,

+                              NULL);

+        gnome_settings_profile_end ("preloading gconf keys");

+

         _load_all (manager);

         ret = TRUE;

@@ -379,6 +380,12 @@ gnome_settings_manager_stop (GnomeSettingsManager *manager)

 #endif

         _unload_all (manager);

+

+        gconf_client_remove_dir (manager->priv->gconf_client,

+                                 manager->priv->settings_prefix,

+                                 NULL);

+        g_object_unref (manager->priv->gconf_client);

+        manager->priv->gconf_client = NULL;

 }

 static void

diff --git a/gnome-settings-daemon/gnome-settings-plugin-info.c b/gnome-settings-daemon/gnome-settings-plugin-info.c

index 983a3e1..a4a10a8 100644

--- a/gnome-settings-daemon/gnome-settings-plugin-info.c

+++ b/gnome-settings-daemon/gnome-settings-plugin-info.c

@@ -185,7 +185,7 @@ gnome_settings_plugin_info_fill_from_file (GnomeSettingsPluginInfo *info,

         int       priority;

         gboolean  ret;

-        gnome_settings_profile_start (NULL);

+        gnome_settings_profile_start ("%s", filename);

         ret = FALSE;

@@ -290,7 +290,7 @@ gnome_settings_plugin_info_fill_from_file (GnomeSettingsPluginInfo *info,

         ret = TRUE;

  out:

-        gnome_settings_profile_end (NULL);

+        gnome_settings_profile_end ("%s", filename);

         return ret;

 }

@@ -312,15 +312,6 @@ void

 gnome_settings_plugin_info_set_enabled_key_name (GnomeSettingsPluginInfo *info,

                                                  const char              *key_name)

 {

-        char *dirname;

-

-        dirname = g_path_get_dirname (key_name);

-        if (dirname != NULL) {

-                g_debug ("Monitoring dir %s for changes", dirname);

-                gconf_client_add_dir (info->priv->client, dirname, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);

-                g_free (dirname);

-        }

-

         info->priv->enabled_notification_id = gconf_client_notify_add (info->priv->client,

                                                                        key_name,

                                                                        (GConfClientNotifyFunc)plugin_enabled_cb,

@@ -388,7 +379,7 @@ load_plugin_module (GnomeSettingsPluginInfo *info)

         g_return_val_if_fail (info->priv->plugin == NULL, FALSE);

         g_return_val_if_fail (info->priv->available, FALSE);

-        gnome_settings_profile_start (NULL);

+        gnome_settings_profile_start ("%s", info->priv->location);

         switch (info->priv->loader) {

                 case GNOME_SETTINGS_PLUGIN_LOADER_C:

@@ -484,7 +475,7 @@ load_plugin_module (GnomeSettingsPluginInfo *info)

         g_type_module_unuse (info->priv->module);

         ret = TRUE;

  out:

-        gnome_settings_profile_end (NULL);

+        gnome_settings_profile_end ("%s", info->priv->location);

         return ret;

 }

diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c

index b4c43d2..c96381b 100644

--- a/gnome-settings-daemon/main.c

+++ b/gnome-settings-daemon/main.c

@@ -24,6 +24,9 @@

 #include <libintl.h>

 #include <errno.h>

 #include <locale.h>

+#include <signal.h>

+#include <fcntl.h>

+#include <sys/wait.h>

 #include <glib/gi18n.h>

 #include <glib/gstdio.h>

@@ -44,6 +47,7 @@

 static char      *gconf_prefix = NULL;

 static gboolean   no_daemon    = FALSE;

 static gboolean   debug        = FALSE;

+static int        pipefds[2];

 static GOptionEntry entries[] = {

         {"debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },

@@ -187,10 +191,10 @@ set_session_over_handler (DBusGConnection *bus, GnomeSettingsManager *manager)

                                             GNOME_SESSION_DBUS_OBJECT,

                                             GNOME_SESSION_DBUS_INTERFACE);

-	dbus_g_object_register_marshaller (

-		g_cclosure_marshal_VOID__VOID,

-		G_TYPE_NONE,

-		G_TYPE_INVALID);

+        dbus_g_object_register_marshaller (

+                g_cclosure_marshal_VOID__VOID,

+                G_TYPE_NONE,

+                G_TYPE_INVALID);

         dbus_g_proxy_add_signal (session_proxy,

                                  "SessionOver",

@@ -223,6 +227,119 @@ gsd_log_default_handler (const gchar   *log_domain,

                                unused_data);

 }

+

+/* We want the parent process to quit after initializing all plugins,

+ * but we have to do all the work in the child process.  We can't

+ * initialize in parent and then fork here: that is not clean with

+ * X display and DBUS where we would make the connection from one

+ * process and continue using it from the other. So, we just make the

+ * parent to fork early and wait. */

+

+static void

+daemon_start (void)

+{

+        int child_pid;

+        char buf[1];

+

+        if (no_daemon)

+                return;

+

+        gnome_settings_profile_msg ("forking daemon");

+

+        signal (SIGPIPE, SIG_IGN);

+        if (-1 == pipe (pipefds)) {

+                g_error ("Could not create pipe: %s", g_strerror (errno));

+                exit (EXIT_FAILURE);

+        }

+

+        child_pid = fork ();

+

+        switch (child_pid) {

+        case -1:

+                g_error ("Could not daemonize: %s", g_strerror (errno));

+                exit (EXIT_FAILURE);

+

+        case 0:

+                /* child */

+

+                close (pipefds[0]);

+

+                return;

+

+         default:

+                /* parent */

+

+                close (pipefds[1]);

+

+                /* Wait for child to signal that we are good to go. */

+                read (pipefds[0], buf, 1);

+

+                exit (EXIT_SUCCESS);

+        }

+}

+

+static void

+daemon_detach (void)

+{

+        if (no_daemon)

+                return;

+

+        gnome_settings_profile_msg ("detaching daemon");

+

+        /* disconnect */

+        setsid ();

+        close (0);

+        close (1);

+        open ("/dev/null", O_RDONLY);

+        open ("/dev/null", O_WRONLY);

+

+        /* get outta the way */

+        chdir ("/");

+        umask (0117);

+}

+

+static void

+daemon_terminate_parent (void)

+{

+        if (no_daemon)

+                return;

+

+        gnome_settings_profile_msg ("terminating parent");

+

+        write (pipefds[1], "1", 1);

+        close (pipefds[1]);

+}

+

+static void

+parse_args (int *argc, char ***argv)

+{

+        GError *error;

+        GOptionContext *context;

+

+        gnome_settings_profile_start (NULL);

+

+

+        context = g_option_context_new (NULL);

+

+        g_option_context_add_main_entries (context, entries, NULL);

+        g_option_context_add_group (context, gtk_get_option_group (FALSE));

+

+        error = NULL;

+        if (!g_option_context_parse (context, argc, argv, &error)) {

+                if (error != NULL) {

+                        g_warning ("%s", error->message);

+                        g_error_free (error);

+                } else {

+                        g_warning ("Unable to initialize GTK+");

+                }

+                exit (EXIT_FAILURE);

+        }

+

+        g_option_context_free (context);

+

+        gnome_settings_profile_end (NULL);

+}

+

 int

 main (int argc, char *argv[])

 {

@@ -238,29 +355,25 @@ main (int argc, char *argv[])

         bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);

         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");

         textdomain (GETTEXT_PACKAGE);

-

         setlocale (LC_ALL, "");

+        parse_args (&argc, &argv);

+

+        daemon_start ();

+

         g_type_init ();

-        gnome_settings_profile_start ("gtk init");

-        error = NULL;

-        if (! gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error)) {

-                if (error != NULL) {

-                        g_warning (error->message);

-                        g_error_free (error);

-                } else {

-                        g_warning ("Unable to initialize GTK+");

-                }

-                exit (1);

+        gnome_settings_profile_start ("opening gtk display");

+        if (! gtk_init_check (NULL, NULL)) {

+                g_warning ("Unable to initialize GTK+");

+                daemon_terminate_parent ();

+                exit (EXIT_FAILURE);

         }

-        gnome_settings_profile_end ("gtk init");

+        gnome_settings_profile_end ("opening gtk display");

-        g_log_set_default_handler (gsd_log_default_handler, NULL);

+        daemon_detach ();

-        if (! no_daemon && daemon (0, 0)) {

-                g_error ("Could not daemonize: %s", g_strerror (errno));

-        }

+        g_log_set_default_handler (gsd_log_default_handler, NULL);

         bus = get_session_bus ();

         if (bus == NULL) {

@@ -298,6 +411,8 @@ main (int argc, char *argv[])

                 }

         }

+        daemon_terminate_parent ();

+

         gtk_main ();

  out:

diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c

index eaea1a3..3a990db 100644

--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c

+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c

@@ -71,15 +71,10 @@ struct GsdA11yKeyboardManagerPrivate

 #endif /* HAVE_LIBNOTIFY */

 };

-#define GSD_KBD_A11Y_ERROR gsd_kbd_a11y_error_quark ()

-

-enum {

-        GSD_KBD_A11Y_ERROR_NOT_AVAILABLE

-};

-

 static void     gsd_a11y_keyboard_manager_class_init  (GsdA11yKeyboardManagerClass *klass);

 static void     gsd_a11y_keyboard_manager_init        (GsdA11yKeyboardManager      *a11y_keyboard_manager);

 static void     gsd_a11y_keyboard_manager_finalize    (GObject             *object);

+static void     gsd_a11y_keyboard_manager_ensure_status_icon (GsdA11yKeyboardManager *manager);

 G_DEFINE_TYPE (GsdA11yKeyboardManager, gsd_a11y_keyboard_manager, G_TYPE_OBJECT)

@@ -92,19 +87,12 @@ static gpointer manager_object = NULL;

 #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)

 {

         gboolean have_xkb;

         int opcode, errorBase, major, minor;

-        gdk_error_trap_push ();

         have_xkb = XkbQueryExtension (GDK_DISPLAY (),

                                       &opcode,

                                       &manager->priv->xkbEventBase,

@@ -112,8 +100,6 @@ xkb_enabled (GsdA11yKeyboardManager *manager)

                                       &major,

                                       &minor)

                 && XkbUseExtension (GDK_DISPLAY (), &major, &minor);

-        XSync (GDK_DISPLAY (), FALSE);

-        gdk_error_trap_pop ();

         return have_xkb;

 }

@@ -130,7 +116,6 @@ get_xkb_desc_rec (GsdA11yKeyboardManager *manager)

                 desc->ctrls = NULL;

                 status = XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);

         }

-        XSync (GDK_DISPLAY (), FALSE);

         gdk_error_trap_pop ();

         g_return_val_if_fail (desc != NULL, NULL);

@@ -449,6 +434,10 @@ maybe_show_status_icon (GsdA11yKeyboardManager *manager)

         show = gconf_client_get_bool (client, CONFIG_ROOT "/enable", NULL);

         g_object_unref (client);

+        if (!show && manager->priv->status_icon == NULL)

+                return;

+

+        gsd_a11y_keyboard_manager_ensure_status_icon (manager);

         gtk_status_icon_set_visible (manager->priv->status_icon, show);

 }

@@ -538,7 +527,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,

         message = _("You just held down the Shift key for 8 seconds.  This is the shortcut "

                     "for the Slow Keys feature, which affects the way your keyboard works.");

-        if (! gtk_status_icon_is_embedded (manager->priv->status_icon)) {

+        if (manager->priv->status_icon == NULL || ! gtk_status_icon_is_embedded (manager->priv->status_icon)) {

                 return FALSE;

         }

@@ -553,6 +542,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,

                 manager->priv->notification = NULL;

         }

+        gsd_a11y_keyboard_manager_ensure_status_icon (manager);

         manager->priv->notification = notify_notification_new_with_status_icon (title,

                                                                                 message,

                                                                                 "preferences-desktop-accessibility",

@@ -681,7 +671,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,

                 _("You just pressed two keys at once, or pressed the Shift key 5 times in a row.  "

                   "This turns off the Sticky Keys feature, which affects the way your keyboard works.");

-        if (! gtk_status_icon_is_embedded (manager->priv->status_icon)) {

+        if (manager->priv->status_icon == NULL || ! gtk_status_icon_is_embedded (manager->priv->status_icon)) {

                 return FALSE;

         }

@@ -696,6 +686,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,

                 manager->priv->notification = NULL;

         }

+        gsd_a11y_keyboard_manager_ensure_status_icon (manager);

         manager->priv->notification = notify_notification_new_with_status_icon (title,

                                                                                 message,

                                                                                 "preferences-desktop-accessibility",

@@ -997,27 +988,21 @@ register_config_callback (GsdA11yKeyboardManager  *manager,

                           GConfClientNotifyFunc    func,

                           guint                   *notify)

 {

-        gconf_client_add_dir (client, path, GCONF_CLIENT_PRELOAD_NONE, NULL);

+        gconf_client_add_dir (client, path, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);

         *notify = gconf_client_notify_add (client, path, func, manager, NULL, NULL);

 }

-gboolean

-gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager,

-                                 GError                **error)

+static gboolean

+start_a11y_keyboard_idle_cb (GsdA11yKeyboardManager *manager)

 {

         guint        event_mask;

         GConfClient *client;

-        gboolean     ret = FALSE;

         g_debug ("Starting a11y_keyboard manager");

         gnome_settings_profile_start (NULL);

-        if (!xkb_enabled (manager)) {

-                g_set_error (error, GSD_KBD_A11Y_ERROR,

-                             GSD_KBD_A11Y_ERROR_NOT_AVAILABLE,

-                             "XKB functionality is disabled.");

+        if (!xkb_enabled (manager))

                 goto out;

-        }

         client = gconf_client_get_default ();

@@ -1036,26 +1021,35 @@ gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager,

         set_server_from_gconf (manager, client);

         g_object_unref (client);

-        gdk_error_trap_push ();

         XkbSelectEvents (GDK_DISPLAY (),

                          XkbUseCoreKbd,

                          event_mask,

                          event_mask);

-        XSync (GDK_DISPLAY (), FALSE);

-        gdk_error_trap_pop ();

-

         gdk_window_add_filter (NULL,

                                (GdkFilterFunc) cb_xkb_event_filter,

                                manager);

         maybe_show_status_icon (manager);

-        ret = TRUE;

-

  out:

         gnome_settings_profile_end (NULL);

-        return ret;

+

+        return FALSE;

+}

+

+

+gboolean

+gsd_a11y_keyboard_manager_start (GsdA11yKeyboardManager *manager,

+                                 GError                **error)

+{

+        gnome_settings_profile_start (NULL);

+

+        g_idle_add ((GSourceFunc) start_a11y_keyboard_idle_cb, manager);

+

+        gnome_settings_profile_end (NULL);

+

+        return TRUE;

 }

 void

@@ -1065,7 +1059,8 @@ gsd_a11y_keyboard_manager_stop (GsdA11yKeyboardManager *manager)

         g_debug ("Stopping a11y_keyboard manager");

-        gtk_status_icon_set_visible (manager->priv->status_icon, FALSE);

+        if (manager->priv->status_icon)

+                gtk_status_icon_set_visible (manager->priv->status_icon, FALSE);

         if (p->gconf_notify != 0) {

                 GConfClient *client = gconf_client_get_default ();

@@ -1199,16 +1194,27 @@ on_status_icon_activate (GtkStatusIcon          *status_icon,

 }

 static void

+gsd_a11y_keyboard_manager_ensure_status_icon (GsdA11yKeyboardManager *manager)

+{

+        gnome_settings_profile_start (NULL);

+

+        if (!manager->priv->status_icon) {

+

+                manager->priv->status_icon = gtk_status_icon_new_from_icon_name ("preferences-desktop-accessibility");

+                g_signal_connect (manager->priv->status_icon,

+                                  "activate",

+                                  G_CALLBACK (on_status_icon_activate),

+                                  manager);

+        }

+

+        gnome_settings_profile_end (NULL);

+}

+

+static void

 gsd_a11y_keyboard_manager_init (GsdA11yKeyboardManager *manager)

 {

         manager->priv = GSD_A11Y_KEYBOARD_MANAGER_GET_PRIVATE (manager);

-        manager->priv->status_icon = gtk_status_icon_new_from_icon_name ("preferences-desktop-accessibility");

-        g_signal_connect (manager->priv->status_icon,

-                          "activate",

-                          G_CALLBACK (on_status_icon_activate),

-                          manager);

-

 #ifdef HAVE_LIBNOTIFY

         notify_init ("gnome-settings-daemon");

 #endif /* HAVE_LIBNOTIFY */

diff --git a/plugins/clipboard/gsd-clipboard-manager.c b/plugins/clipboard/gsd-clipboard-manager.c

index 5f407df..f8cb7ec 100644

--- a/plugins/clipboard/gsd-clipboard-manager.c

+++ b/plugins/clipboard/gsd-clipboard-manager.c

@@ -82,13 +82,6 @@ typedef struct

         int         offset;

 } IncrConversion;

-#define GSD_CLIPBOARD_ERROR gsd_clipboard_error_quark ()

-

-enum {

-        GSD_CLIPBOARD_ERROR_RUNNING,

-        GSD_CLIPBOARD_ERROR_FAILED

-};

-

 static void     gsd_clipboard_manager_class_init  (GsdClipboardManagerClass *klass);

 static void     gsd_clipboard_manager_init        (GsdClipboardManager      *clipboard_manager);

 static void     gsd_clipboard_manager_finalize    (GObject                  *object);

@@ -103,12 +96,6 @@ G_DEFINE_TYPE (GsdClipboardManager, gsd_clipboard_manager, G_TYPE_OBJECT)

 static gpointer manager_object = NULL;

-static GQuark

-gsd_clipboard_error_quark (void)

-{

-        return g_quark_from_static_string ("gsd-clipboard-error-quark");

-}

-

 /* We need to use reference counting for the target data, since we may

  * need to keep the data around after loosing the CLIPBOARD ownership

  * to complete incremental transfers.

@@ -858,22 +845,19 @@ clipboard_manager_watch_cb (GsdClipboardManager *manager,

         }

 }

-gboolean

-gsd_clipboard_manager_start (GsdClipboardManager *manager,

-                             GError             **error)

+static gboolean

+start_clipboard_idle_cb (GsdClipboardManager *manager)

 {

         XClientMessageEvent xev;

-        g_debug ("Starting clipboard manager");

+

         gnome_settings_profile_start (NULL);

         init_atoms (manager->priv->display);

         /* check if there is a clipboard manager running */

         if (XGetSelectionOwner (manager->priv->display, XA_CLIPBOARD_MANAGER)) {

-                g_set_error (error, GSD_CLIPBOARD_ERROR,

-                             GSD_CLIPBOARD_ERROR_RUNNING,

-                             "Clipboard manager is already running.");

+                g_warning ("Clipboard manager is already running.");

                 return FALSE;

         }

@@ -929,15 +913,23 @@ gsd_clipboard_manager_start (GsdClipboardManager *manager,

                                             0,

                                             NULL);

                 /* FIXME: manager->priv->terminate (manager->priv->cb_data); */

-

-                g_set_error (error, GSD_CLIPBOARD_ERROR,

-                             GSD_CLIPBOARD_ERROR_FAILED,

-                             "Failed to claim selection.");

-                return FALSE;

         }

         gnome_settings_profile_end (NULL);

+        return FALSE;

+}

+

+gboolean

+gsd_clipboard_manager_start (GsdClipboardManager *manager,

+                             GError             **error)

+{

+        gnome_settings_profile_start (NULL);

+

+        g_idle_add ((GSourceFunc) start_clipboard_idle_cb, manager);

+

+        gnome_settings_profile_end (NULL);

+