[meego-commits] 15121: Changes to MeeGo:1.1:Netbook:Update:Testing/gnome-packagekit

[Zhang Qiang]

Hi,
I have made the following changes to gnome-packagekit in project MeeGo:1.1:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #15121:

  submit:   home:xiaoqiang:branches:MeeGo:1.1:Netbook:Update:Testing/gnome-packagekit(r2)(cleanup) -> MeeGo:1.1:Netbook:Update:Testing/gnome-packagekit


Message:
    Add gpk-application-set-treeview_packages-insensitive-while-searching.patch to set treeview_packages widget as insensitive while gpk-app is in the progress of searching, fix BMC#14813

State:   new          2011-03-23T00:12:51 xiaoqiang
Comment: None



changes files:
--------------
--- gnome-packagekit.changes
+++ gnome-packagekit.changes
@@ -0,0 +1,5 @@
+* Wed Mar 23 2011 Zhang Qiang <qiang.z.zhang at intel.com> - 2.30.3
+- Add gpk-application-set-treeview_packages-insensitive-while-searching.patch
+  to set treeview_packages widget as insensitive while gpk-app is
+  in the progress of searching, fix BMC#14813
+

new:
----
  gpk-application-set-treeview_packages-insensitive-while-searching.patch

spec files:
-----------
--- gnome-packagekit.spec
+++ gnome-packagekit.spec
@@ -43,6 +43,7 @@
 Patch16:     gpk-application-active-no-filter-for-Source.patch
 Patch17:     gpk-application-make-apply-button-insensitive-while-applying.patch
 Patch18:     gpk-application-show-network-state.patch
+Patch19:     gpk-application-set-treeview_packages-insensitive-while-searching.patch
 Requires:   glib2 >= %{glib2_version}
 Requires:   gtk2 >= %{gtk2_version}
 Requires:   gnome-icon-theme
@@ -149,6 +150,8 @@
 %patch17 -p1
 # gpk-application-show-network-state.patch
 %patch18 -p1
+# gpk-application-set-treeview_packages-insensitive-while-searching.patch
+%patch19 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ gnome-packagekit.yaml
--- gnome-packagekit.yaml
+++ gnome-packagekit.yaml
@@ -28,6 +28,7 @@
     - gpk-application-active-no-filter-for-Source.patch
     - gpk-application-make-apply-button-insensitive-while-applying.patch
     - gpk-application-show-network-state.patch
+    - gpk-application-set-treeview_packages-insensitive-while-searching.patch
 Description: |
     gnome-packagekit provides session applications for the PackageKit API.
     There are several utilities designed for installing, updating and

++++++ gpk-application-set-treeview_packages-insensitive-while-searching.patch (new)
--- gpk-application-set-treeview_packages-insensitive-while-searching.patch
+++ gpk-application-set-treeview_packages-insensitive-while-searching.patch
+diff -uNr gnome-packagekit-2.30.3/src/gpk-application.c gnome-packagekit-2.30.3.new/src/gpk-application.c
+--- gnome-packagekit-2.30.3/src/gpk-application.c	2011-03-23 15:06:27.713581294 +0800
++++ gnome-packagekit-2.30.3.new/src/gpk-application.c	2011-03-23 15:08:43.678393762 +0800
+@@ -1589,6 +1589,8 @@
+ out:
+ 	/* mark find button sensitive */
+ 	application->priv->search_in_progress = FALSE;
++	widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "scrolledwindow_groups"));
++	gtk_widget_set_sensitive (widget, TRUE);
+ 	gpk_application_set_button_find_sensitivity (application);
+ 
+ 	if (error_code != NULL)
+@@ -1688,6 +1690,8 @@
+ 
+ 	g_return_if_fail (GPK_IS_APPLICATION (application));
+ 	g_return_if_fail (application->priv->group != NULL);
++	
++	application->priv->search_in_progress = TRUE;
+ 
+ 	if (application->priv->search_mode == PK_MODE_GROUP) {
+ 		groups = g_strsplit (application->priv->group, " ", -1);
+@@ -1760,6 +1764,16 @@
+ gpk_application_perform_search (GpkApplication *application)
+ {
+ 	g_return_if_fail (GPK_IS_APPLICATION (application));
++	GtkWidget *widget;
++
++	/*if we are in the middle of a search, just return*/
++	if (application->priv->search_in_progress == TRUE)
++		return;
++
++	if (application->priv->search_mode == PK_MODE_NAME_DETAILS_FILE || application->priv->search_mode == PK_MODE_GROUP) {
++		widget = GTK_WIDGET (gtk_builder_get_object (application->priv->builder, "scrolledwindow_groups"));
++		gtk_widget_set_sensitive (widget, FALSE);
++	}
+ 
+ 	gpk_application_clear_details (application);
+ 	gpk_application_clear_packages (application);