[meego-commits] 24211: 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 #24211:

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


Message:
    * Tue Jun  7 2011 Zhang Qiang <qiang.z.zhang at intel.com> - 2.30.3
- Add two patches:
  gpk-update-viewer-disable-details-info.patch,
  gpk-update-viewer-disable-distro-upgrade.patch(patch from 1.2)
  to fix BMC#3906 and BMC#12406

State:   new          2011-10-11T00:51:49 xiaoqiang
Comment: None



changes files:
--------------
--- gnome-packagekit.changes
+++ gnome-packagekit.changes
@@ -0,0 +1,6 @@
+* Tue Jun  7 2011 Zhang Qiang <qiang.z.zhang at intel.com> - 2.30.3
+- Add two patches:
+  gpk-update-viewer-disable-details-info.patch,
+  gpk-update-viewer-disable-distro-upgrade.patch(patch from 1.2)
+  to fix BMC#3906 and BMC#12406
+

new:
----
  gpk-update-viewer-disable-details-info.patch
  gpk-update-viewer-disable-distro-upgrade.patch

spec files:
-----------
--- gnome-packagekit.spec
+++ gnome-packagekit.spec
@@ -44,6 +44,9 @@
 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
+Patch20:     gpk-update-viewer-disable-details-info.patch 
+Patch21:     gpk-update-viewer-disable-distro-upgrade.patch
+
 Requires:   glib2 >= %{glib2_version}
 Requires:   gtk2 >= %{gtk2_version}
 Requires:   gnome-icon-theme
@@ -152,6 +155,10 @@
 %patch18 -p1
 # gpk-application-set-treeview_packages-insensitive-while-searching.patch
 %patch19 -p1
+# gpk-update-viewer-disable-details-info.patch 
+%patch20 -p1
+# gpk-update-viewer-disable-distro-upgrade.patch
+%patch21 -p1
 # >> setup
 # << setup
 

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

++++++ gpk-update-viewer-disable-details-info.patch (new)
--- gpk-update-viewer-disable-details-info.patch
+++ gpk-update-viewer-disable-details-info.patch
+diff -uNr gnome-packagekit-2.30.3/src/gpk-update-viewer.c gnome-packagekit-2.30.3.new/src/gpk-update-viewer.c
+--- gnome-packagekit-2.30.3/src/gpk-update-viewer.c	2011-06-07 16:02:10.353517071 +0800
++++ gnome-packagekit-2.30.3.new/src/gpk-update-viewer.c	2011-06-07 16:01:50.752453469 +0800
+@@ -865,7 +865,7 @@
+ 		      "package", &package,
+ 		      "allow-cancel", &allow_cancel,
+ 		      NULL);
+-
++#if 0
+ 	if (type == PK_PROGRESS_TYPE_PACKAGE) {
+ 
+ 		GtkTreeView *treeview;
+@@ -943,6 +943,8 @@
+ 			path = gpk_update_viewer_model_get_path (model, package_id);
+ 			if (path == NULL) {
+ 				egg_warning ("found no package %s", package_id);
++				g_free (summary);
++				g_free (package_id);
+ 				goto out;
+ 			}
+ 
+@@ -994,7 +996,9 @@
+ 
+ 		gtk_tree_path_free (path);
+ 
+-	} else if (type == PK_PROGRESS_TYPE_STATUS) {
++	} else 
++#endif
++	if (type == PK_PROGRESS_TYPE_STATUS) {
+ 
+ 		GdkWindow *window;
+ 		const gchar *title;
+@@ -1105,8 +1109,6 @@
+ 		gtk_widget_set_sensitive (widget, (allow_cancel || idle));
+ 	}
+ out:
+-	g_free (summary);
+-	g_free (package_id);
+ 	if (package != NULL)
+ 		g_object_unref (package);
+ }

++++++ gpk-update-viewer-disable-distro-upgrade.patch (new)
--- gpk-update-viewer-disable-distro-upgrade.patch
+++ gpk-update-viewer-disable-distro-upgrade.patch
+diff -uNr gnome-packagekit-2.30.3/src/gpk-update-viewer.c gnome-packagekit-2.30.3.new/src/gpk-update-viewer.c
+--- gnome-packagekit-2.30.3/src/gpk-update-viewer.c	2011-01-25 15:27:37.335440055 +0800
++++ gnome-packagekit-2.30.3.new/src/gpk-update-viewer.c	2011-05-10 17:24:37.878579591 +0800
+@@ -1499,6 +1499,11 @@
+ 	/* no updates */
+ 	len = priv->update_array->len;
+ 	if (len == 0) {
++		widget = GTK_WIDGET(gtk_builder_get_object (priv->builder, "image_progress"));
++		gtk_widget_hide (widget);
++
++		widget = GTK_WIDGET(gtk_builder_get_object (priv->builder, "progressbar_progress"));
++		gtk_widget_hide (widget);
+                 gpk_update_viewer_modal_error_with_timeout (update_viewer,
+                                 /* TRANSLATORS: title: nothing to do */
+                                 _("All software is up to date"),
+@@ -3121,11 +3126,13 @@
+ 		      NULL);
+ 
+ 	/* get the distro-upgrades if we support it */
++#if 0
+ 	if (pk_bitfield_contain (roles, PK_ROLE_ENUM_GET_DISTRO_UPGRADES)) {
+ 		pk_client_get_distro_upgrades_async (PK_CLIENT(priv->task), priv->cancellable,
+ 						     (PkProgressCallback) gpk_update_viewer_progress_cb, update_viewer,
+ 						     (GAsyncReadyCallback) gpk_update_viewer_get_distro_upgrades_cb, update_viewer);
+ 	}
++#endif
+ out:
+ 	return;
+ }