[gnome-color-manager] Only add the saved client devices once to speed up startup



commit 8920e1ce981be54bc74d05c8b52fa391299097e9
Author: Richard Hughes <richard hughsie com>
Date:   Wed Jan 27 07:06:18 2010 +0000

    Only add the saved client devices once to speed up startup

 src/gcm-prefs.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/src/gcm-prefs.c b/src/gcm-prefs.c
index b3cfeae..0a12955 100644
--- a/src/gcm-prefs.c
+++ b/src/gcm-prefs.c
@@ -2521,30 +2521,19 @@ gcm_prefs_startup_phase1_idle_cb (gpointer user_data)
 	g_signal_connect (G_OBJECT (widget), "changed",
 			  G_CALLBACK (gcm_prefs_renderer_combo_changed_cb), (gpointer) "softproof");
 
-	/* coldplug saved devices */
-	ret = gcm_client_add_saved (gcm_client, &error);
-	if (!ret) {
-		egg_warning ("failed to coldplug: %s", error->message);
-		g_error_free (error);
-		error = NULL;
-		/* do not fail */
-	}
-
 	/* coldplug plugged in devices */
 	ret = gcm_client_add_connected (gcm_client, &error);
 	if (!ret) {
-		egg_warning ("failed to coldplug: %s", error->message);
+		egg_warning ("failed to add connected devices: %s", error->message);
 		g_error_free (error);
-		error = NULL;
 		goto out;
 	}
 
 	/* coldplug saved devices */
 	ret = gcm_client_add_saved (gcm_client, &error);
 	if (!ret) {
-		egg_warning ("failed to coldplug: %s", error->message);
-		g_error_free (error);
-		error = NULL;
+		egg_warning ("failed to add saved devices: %s", error->message);
+		g_clear_error (&error);
 		/* do not fail */
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]