[gnome-packagekit/gnome-2-30] Do not set the Add/Remove search to name but instead use the GConf defaults

[Richard Hughes <rhughes src gnome org>]

commit 2e63a65b25d1235afaffaeb227b6f3d87e9d9e62
Author: Richard Hughes <richard hughsie com>
Date:   Sat May 15 17:17:49 2010 +0100

    Do not set the Add/Remove search to name but instead use the GConf defaults
    
    In gpk-application we were checking if the backend could search by details
    before we had set the possible roles and thus the check failed. This meant
    we always set searching by name, and the user got less results than they
    expected.

 src/gpk-application.c |   79 ++++++++++++++++++++++++-------------------------
 1 files changed, 39 insertions(+), 40 deletions(-)
---
diff --git a/src/gpk-application.c b/src/gpk-application.c
index b89929d..10ad0ee 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -3526,6 +3526,7 @@ pk_backend_status_get_properties_cb (GObject *object, GAsyncResult *res, GpkAppl
 	gboolean enabled;
 	GtkTreeIter iter;
 	const gchar *icon_name;
+	gchar *mode = NULL;
 
 	/* get the result */
 	ret = pk_control_get_properties_finish (control, res, &error);
@@ -3682,7 +3683,45 @@ pk_backend_status_get_properties_cb (GObject *object, GAsyncResult *res, GpkAppl
 		gpk_application_create_group_array_categories (application);
 	else
 		gpk_application_create_group_array_enum (application);
+
+	/* set the search mode */
+	mode = gconf_client_get_string (application->priv->gconf_client, GPK_CONF_APPLICATION_SEARCH_MODE, NULL);
+	if (mode == NULL) {
+		egg_warning ("search mode not set, using name");
+		mode = g_strdup ("name");
+	}
+
+	/* search by name */
+	if (g_strcmp0 (mode, "name") == 0) {
+		gpk_application_menu_search_by_name (NULL, application);
+
+	/* set to details if we can we do the action? */
+	} else if (g_strcmp0 (mode, "details") == 0) {
+		if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_DETAILS)) {
+			gpk_application_menu_search_by_description (NULL, application);
+		} else {
+			egg_warning ("cannont use mode %s as not capable, using name", mode);
+			gpk_application_menu_search_by_name (NULL, application);
+		}
+
+	/* set to file if we can we do the action? */
+	} else if (g_strcmp0 (mode, "file") == 0) {
+		gpk_application_menu_search_by_file (NULL, application);
+
+		if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_FILE)) {
+			gpk_application_menu_search_by_file (NULL, application);
+		} else {
+			egg_warning ("cannont use mode %s as not capable, using name", mode);
+			gpk_application_menu_search_by_name (NULL, application);
+		}
+
+	/* mode not recognised */
+	} else {
+		egg_warning ("cannot recognise mode %s, using name", mode);
+		gpk_application_menu_search_by_name (NULL, application);
+	}
 out:
+	g_free (mode);
 	return;
 }
 
@@ -3762,7 +3801,6 @@ gpk_application_init (GpkApplication *application)
 	GtkEntryCompletion *completion;
 	GtkTreeSelection *selection;
 	gboolean ret;
-	gchar *mode;
 	GError *error = NULL;
 	GSList *array;
 	guint retval;
@@ -4147,45 +4185,6 @@ gpk_application_init (GpkApplication *application)
 
 	/* hide details */
 	gpk_application_clear_details (application);
-
-	/* set the search mode */
-	mode = gconf_client_get_string (application->priv->gconf_client, GPK_CONF_APPLICATION_SEARCH_MODE, NULL);
-	if (mode == NULL) {
-		egg_warning ("search mode not set, using name");
-		mode = g_strdup ("name");
-	}
-
-	/* search by name */
-	if (g_strcmp0 (mode, "name") == 0) {
-		gpk_application_menu_search_by_name (NULL, application);
-
-	/* set to details if we can we do the action? */
-	} else if (g_strcmp0 (mode, "details") == 0) {
-		if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_DETAILS)) {
-			gpk_application_menu_search_by_description (NULL, application);
-		} else {
-			egg_warning ("cannont use mode %s as not capable, using name", mode);
-			gpk_application_menu_search_by_name (NULL, application);
-		}
-
-	/* set to file if we can we do the action? */
-	} else if (g_strcmp0 (mode, "file") == 0) {
-		gpk_application_menu_search_by_file (NULL, application);
-
-		if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_FILE)) {
-			gpk_application_menu_search_by_file (NULL, application);
-		} else {
-			egg_warning ("cannont use mode %s as not capable, using name", mode);
-			gpk_application_menu_search_by_name (NULL, application);
-		}
-
-	/* mode not recognised */
-	} else {
-		egg_warning ("cannot recognise mode %s, using name", mode);
-		gpk_application_menu_search_by_name (NULL, application);
-	}
-	g_free (mode);
-
 out_build:
 	/* welcome */
 	gpk_application_add_welcome (application);