[gnome-packagekit] Don't set the package view insensitive when doing searches, and add a delay to prevent flicker. Fixe

[Richard Hughes <rhughes src gnome org>]

commit 75880f2ef691edbab2e0d68faf119332c2dc6fab
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jul 21 12:25:07 2009 +0100

    Don't set the package view insensitive when doing searches, and add a delay to prevent flicker. Fixes rh#510730

 src/gpk-application.c |  102 +++++++++++++++++++++++++++++++++++++++++-------
 src/gpk-common.h      |    3 +
 src/gpk-enum.c        |    3 +-
 src/gpk-repo.c        |   26 +++++++++---
 4 files changed, 111 insertions(+), 23 deletions(-)
---
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 25681e1..e14b218 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -111,6 +111,8 @@ struct GpkApplicationPrivate
 	GpkHelperDepsInstall	*helper_deps_install;
 	GpkHelperMediaChange	*helper_media_change;
 	gboolean		 dep_check_info_only;
+	guint			 status_id;
+	PkStatusEnum		 status_last;
 };
 
 enum {
@@ -1013,7 +1015,13 @@ gpk_application_package_cb (PkClient *client, const PkPackageObj *obj, GpkApplic
 	egg_debug ("package = %s:%s:%s", pk_info_enum_to_text (obj->info), obj->id->name, obj->summary);
 
 	/* ignore not search data */
+#if PK_CHECK_VERSION(0,5,1)
+	g_object_get (client,
+		      "role", &role,
+		      NULL);
+#else
 	pk_client_get_role (client, &role, NULL, NULL);
+#endif
 	if (role == PK_ROLE_ENUM_GET_DEPENDS || role == PK_ROLE_ENUM_GET_REQUIRES)
 		return;
 
@@ -1400,7 +1408,13 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 	g_return_if_fail (GPK_IS_APPLICATION (application));
 
 	/* get role */
+#if PK_CHECK_VERSION(0,5,1)
+	g_object_get (client,
+		      "role", &role,
+		      NULL);
+#else
 	pk_client_get_role (client, &role, NULL, NULL);
+#endif
 	egg_debug ("role: %s, exit: %s", pk_role_enum_to_text (role), pk_exit_enum_to_text (exit_enum));
 
 	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "progressbar_progress"));
@@ -1413,8 +1427,6 @@ gpk_application_finished_cb (PkClient *client, PkExitEnum exit_enum, guint runti
 	gtk_widget_set_sensitive (widget, TRUE);
 	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_detail"));
 	gtk_widget_set_sensitive (widget, TRUE);
-	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_packages"));
-	gtk_widget_set_sensitive (widget, TRUE);
 	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "entry_text"));
 	gtk_widget_set_sensitive (widget, TRUE);
 	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "button_apply"));
@@ -1939,6 +1951,10 @@ gpk_application_button_apply_cb (GtkWidget *widget, GpkApplication *application)
 			g_error_free (error);
 			goto out;
 		}
+
+		/* make package list insensitive */
+		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_packages"));
+		gtk_widget_set_sensitive (widget, FALSE);
 	}
 	if (application->priv->action == PK_ACTION_REMOVE) {
 		/* reset client */
@@ -1957,6 +1973,10 @@ gpk_application_button_apply_cb (GtkWidget *widget, GpkApplication *application)
 			g_error_free (error);
 			goto out;
 		}
+
+		/* make package list insensitive */
+		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_packages"));
+		gtk_widget_set_sensitive (widget, FALSE);
 	}
 out:
 	g_strfreev (package_ids);
@@ -2809,12 +2829,38 @@ gpk_application_menu_filter_newest_cb (GtkWidget *widget, GpkApplication *applic
 }
 
 /**
+ * gpk_application_status_changed_timeout_cb:
+ **/
+static gboolean
+gpk_application_status_changed_timeout_cb (GpkApplication *application)
+{
+	const gchar *text;
+	GtkWidget *widget;
+
+	/* set the text and show */
+	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "label_status"));
+	text = gpk_status_enum_to_localised_text (application->priv->status_last);
+	gtk_label_set_label (GTK_LABEL (widget), text);
+
+	/* set icon */
+	gpk_set_animated_icon_from_status (GPK_ANIMATED_ICON (application->priv->image_status),
+					   application->priv->status_last, GTK_ICON_SIZE_LARGE_TOOLBAR);
+
+	/* show containing box */
+	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "hbox_status"));
+	gtk_widget_show (widget);
+
+	/* never repeat */
+	application->priv->status_id = 0;
+	return FALSE;
+}
+
+/**
  * gpk_application_status_changed_cb:
  **/
 static void
 gpk_application_status_changed_cb (PkClient *client, PkStatusEnum status, GpkApplication *application)
 {
-	const gchar *text;
 	GtkWidget *widget;
 
 	g_return_if_fail (GPK_IS_APPLICATION (application));
@@ -2827,8 +2873,6 @@ gpk_application_status_changed_cb (PkClient *client, PkStatusEnum status, GpkApp
 		gtk_widget_set_sensitive (widget, FALSE);
 		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_detail"));
 		gtk_widget_set_sensitive (widget, FALSE);
-		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_packages"));
-		gtk_widget_set_sensitive (widget, FALSE);
 		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "entry_text"));
 		gtk_widget_set_sensitive (widget, FALSE);
 		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "button_apply"));
@@ -2839,22 +2883,34 @@ gpk_application_status_changed_cb (PkClient *client, PkStatusEnum status, GpkApp
 		gtk_widget_set_sensitive (widget, FALSE);
 	}
 
-	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "hbox_status"));
 	if (status == PK_STATUS_ENUM_FINISHED) {
+
+		/* re-enable UI */
+		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_packages"));
+		gtk_widget_set_sensitive (widget, TRUE);
+
+		/* we've not yet shown, so don't bother */
+		if (application->priv->status_id > 0) {
+			g_source_remove (application->priv->status_id);
+			application->priv->status_id = 0;
+		}
+
+		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "hbox_status"));
 		gtk_widget_hide (widget);
 		gpk_animated_icon_enable_animation (GPK_ANIMATED_ICON (application->priv->image_status), FALSE);
-		return;
+		goto out;
 	}
 
-	/* set the text and show */
-	gtk_widget_show (widget);
-	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "label_status"));
-	text = gpk_status_enum_to_localised_text (status);
-	gtk_label_set_label (GTK_LABEL (widget), text);
+	/* already pending show */
+	if (application->priv->status_id > 0)
+		goto out;
 
-	/* set icon */
-	gpk_set_animated_icon_from_status (GPK_ANIMATED_ICON (application->priv->image_status), status, GTK_ICON_SIZE_LARGE_TOOLBAR);
-	gtk_widget_show (widget);
+	/* only show after some time in the transaction */
+	application->priv->status_id = g_timeout_add (GPK_UI_STATUS_SHOW_DELAY, (GSourceFunc) gpk_application_status_changed_timeout_cb, application);
+
+out:
+	/* save for the callback */
+	application->priv->status_last = status;
 }
 
 /**
@@ -2944,6 +3000,7 @@ gpk_application_deps_remove_event_cb (GpkHelperDepsRemove *helper_deps_remove, G
 	gboolean ret;
 	GError *error = NULL;
 	gchar **package_ids = NULL;
+	GtkWidget *widget;
 
 	if (type != GTK_RESPONSE_YES) {
 		goto out;
@@ -2965,6 +3022,10 @@ gpk_application_deps_remove_event_cb (GpkHelperDepsRemove *helper_deps_remove, G
 		g_error_free (error);
 		goto out;
 	}
+
+	/* make package list insensitive */
+	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_packages"));
+	gtk_widget_set_sensitive (widget, FALSE);
 out:
 	g_strfreev (package_ids);
 }
@@ -2978,6 +3039,7 @@ gpk_application_deps_install_event_cb (GpkHelperDepsInstall *helper_deps_install
 	gboolean ret;
 	GError *error = NULL;
 	gchar **package_ids = NULL;
+	GtkWidget *widget;
 
 	if (type != GTK_RESPONSE_YES) {
 		goto out;
@@ -3003,6 +3065,11 @@ gpk_application_deps_install_event_cb (GpkHelperDepsInstall *helper_deps_install
 		g_error_free (error);
 		goto out;
 	}
+
+	/* make package list insensitive */
+	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "treeview_packages"));
+	gtk_widget_set_sensitive (widget, FALSE);
+
 out:
 	g_strfreev (package_ids);
 }
@@ -3514,6 +3581,8 @@ gpk_application_init (GpkApplication *application)
 	application->priv->has_package = FALSE;
 	application->priv->dep_check_info_only = FALSE;
 	application->priv->details_event_id = 0;
+	application->priv->status_id = 0;
+	application->priv->status_last = PK_STATUS_ENUM_UNKNOWN;
 	application->priv->package_list = pk_package_list_new ();
 
 	application->priv->gconf_client = gconf_client_get_default ();
@@ -4126,6 +4195,9 @@ gpk_application_finalize (GObject *object)
 	g_object_unref (application->priv->helper_media_change);
 	g_object_unref (application->priv->helper_repo_signature);
 
+	if (application->priv->status_id > 0)
+		g_source_remove (application->priv->status_id);
+
 	g_free (application->priv->url);
 	g_free (application->priv->group);
 	g_free (application->priv->search_text);
diff --git a/src/gpk-common.h b/src/gpk-common.h
index 85ebccb..64db208 100644
--- a/src/gpk-common.h
+++ b/src/gpk-common.h
@@ -84,6 +84,9 @@ G_BEGIN_DECLS
 #define GPK_ICON_SOFTWARE_UPDATE_AVAILABLE	"software-update-available"
 #define GPK_ICON_SERVICE_PACK			"gpk-service-pack"
 
+/* any status that is slower than this will not be shown in the UI */
+#define GPK_UI_STATUS_SHOW_DELAY		250 /* ms */
+
 void		 gpk_common_test			(gpointer	 data);
 void		 gtk_text_buffer_insert_markup		(GtkTextBuffer	*buffer,
 							 GtkTextIter	*iter,
diff --git a/src/gpk-enum.c b/src/gpk-enum.c
index 3c31d07..c2a6750 100644
--- a/src/gpk-enum.c
+++ b/src/gpk-enum.c
@@ -671,7 +671,8 @@ gpk_error_enum_to_localised_message (PkErrorCodeEnum code)
 		text = _("Additional media is required to complete the transaction.");
 		break;
 	case PK_ERROR_ENUM_NOT_AUTHORIZED:
-		text = _("You have failed to provide correct authentication. Please check any passwords or account settings.");
+		text = _("You have failed to provide correct authentication.\n"
+			 "Please check any passwords or account settings.");
 		break;
 	case PK_ERROR_ENUM_UPDATE_NOT_FOUND:
 		text = _("The specified update could not be found.\n"
diff --git a/src/gpk-repo.c b/src/gpk-repo.c
index 07cae07..2cce71c 100644
--- a/src/gpk-repo.c
+++ b/src/gpk-repo.c
@@ -42,9 +42,6 @@
 #include "gpk-animated-icon.h"
 #include "gpk-enum.h"
 
-/* any status that is slower than this will not be shown */
-#define GPK_REPO_HIDE_LAG	250 /* ms */
-
 static GtkBuilder *builder = NULL;
 static GtkListStore *list_store = NULL;
 static PkClient *client_query = NULL;
@@ -58,7 +55,9 @@ static GConfClient *gconf_client;
 static gboolean show_details;
 static GtkTreePath *path_global = NULL;
 static GtkWidget *image_animation = NULL;
+#if !PK_CHECK_VERSION(0,5,1)
 static PkStatusEnum status_last = PK_STATUS_ENUM_UNKNOWN;
+#endif
 static guint status_id = 0;
 
 enum {
@@ -313,20 +312,30 @@ gpk_repo_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, gpointer
  * gpk_repo_status_changed_timeout_cb:
  **/
 static gboolean
-gpk_repo_status_changed_timeout_cb (gpointer data)
+gpk_repo_status_changed_timeout_cb (PkClient *client)
 {
 	const gchar *text;
 	GtkWidget *widget;
+	PkStatusEnum status;
+
+#if PK_CHECK_VERSION(0,5,1)
+	/* get the last status */
+	g_object_get (client,
+		      "status", &status,
+		      NULL);
+#else
+	status = status_last;
+#endif
 
 	/* set the text and show */
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "viewport_animation_preview"));
 	gtk_widget_show (widget);
 	widget = GTK_WIDGET (gtk_builder_get_object (builder, "label_animation"));
-	text = gpk_status_enum_to_localised_text (status_last);
+	text = gpk_status_enum_to_localised_text (status);
 	gtk_label_set_label (GTK_LABEL (widget), text);
 
 	/* set icon */
-	gpk_set_animated_icon_from_status (GPK_ANIMATED_ICON (image_animation), status_last, GTK_ICON_SIZE_LARGE_TOOLBAR);
+	gpk_set_animated_icon_from_status (GPK_ANIMATED_ICON (image_animation), status, GTK_ICON_SIZE_LARGE_TOOLBAR);
 
 	/* never repeat */
 	status_id = 0;
@@ -358,10 +367,13 @@ gpk_repo_status_changed_cb (PkClient *client, PkStatusEnum status, gpointer data
 		goto out;
 
 	/* only show after some time in the transaction */
-	status_id = g_timeout_add (GPK_REPO_HIDE_LAG, (GSourceFunc) gpk_repo_status_changed_timeout_cb, NULL);
+	status_id = g_timeout_add (GPK_UI_STATUS_SHOW_DELAY, (GSourceFunc) gpk_repo_status_changed_timeout_cb, client);
 out:
+#if !PK_CHECK_VERSION(0,5,1)
 	/* save for the callback */
 	status_last = status;
+#endif
+	return;
 }
 
 /**