rpms/gnome-packagekit/devel gpk-untitled-window.patch, NONE, 1.1 gpk~fix-resize-small-form-factor.patch, NONE, 1.1 gnome-packagekit.spec, 1.55, 1.56

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15923

Modified Files:
	gnome-packagekit.spec 
Added Files:
	gpk-untitled-window.patch 
	gpk~fix-resize-small-form-factor.patch 
Log Message:
* Fri Oct 24 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.8-2
- Fix the untitled window in gpk-update-viewer. Fixes #468200
- Fix the resize problem on small form factor devices. Fixes #467987


gpk-untitled-window.patch:

--- NEW FILE gpk-untitled-window.patch ---
commit 95e5c1d6c104ea395c3dde9da4a6c327c05ec378
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Oct 22 14:17:48 2008 +0100

    bugfix: don't show 'untitled window' when we review updates and then update them

diff --git a/src/gpk-client.c b/src/gpk-client.c
index 60fb6e6..8ad9fe0 100644
--- a/src/gpk-client.c
+++ b/src/gpk-client.c
@@ -2754,6 +2754,11 @@ gpk_client_update_packages (GpkClient *gclient, gchar **package_ids, GError **er
 		goto out;
 	}
 
+	/* set title */
+	gpk_client_dialog_set_title (gclient->priv->dialog, _("Update packages"));
+	gpk_client_dialog_set_message (gclient->priv->dialog, "");
+	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-update-packages");
+
 	/* wrap update, but handle all the GPG and EULA stuff */
 	ret = pk_client_update_packages (gclient->priv->client_action, package_ids, &error_local);
 	if (!ret) {
@@ -3172,6 +3177,13 @@ gboolean
 gpk_client_set_parent (GpkClient *gclient, GtkWindow *window)
 {
 	g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE);
+
+	/* unparent */
+	if (window == NULL) {
+		gpk_client_dialog_set_parent (gclient->priv->dialog, NULL);
+		return TRUE;
+	}
+
 	gclient->priv->parent_window = GTK_WIDGET (window)->window;
 	egg_debug ("parent_window=%p", gclient->priv->parent_window);
 	gpk_client_dialog_set_parent (gclient->priv->dialog, gclient->priv->parent_window);
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index 2dac749..6c7cfc8 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -133,9 +133,13 @@ gpk_update_viewer_set_page (PkPageEnum page)
 	widget = glade_xml_get_widget (glade_xml, "window_updates");
 	if (page == PAGE_LAST) {
 		gtk_widget_hide (widget);
+		gpk_client_set_parent (gclient, NULL);
 		return;
 	}
 
+	/* restore modalness */
+	gpk_client_set_parent (gclient, GTK_WINDOW (widget));
+
 	/* some pages are resizeable */
 	if (page == PAGE_DETAILS)
 		gtk_window_set_resizable (GTK_WINDOW (widget), TRUE);

gpk~fix-resize-small-form-factor.patch:

--- NEW FILE gpk~fix-resize-small-form-factor.patch ---
commit cc6ecacb62f66bbe4ce71f14583e108d6026b20f
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Oct 24 10:17:43 2008 +0100

    bugfix: don't set resizable FALSE when operating in small form factor mode

diff --git a/src/gpk-common.c b/src/gpk-common.c
index d91630b..f6693ec 100644
--- a/src/gpk-common.c
+++ b/src/gpk-common.c
@@ -53,7 +53,6 @@ gpk_window_set_size_request (GtkWindow *window, guint width, guint height)
 	if (gdk_screen_get_width (screen) < width ||
 	    gdk_screen_get_height (screen) < height) {
 		egg_debug ("using small form factor mode");
-		gtk_window_set_resizable (window, FALSE);
 		gtk_window_maximize (window);
 		return FALSE;
 	}


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/devel/gnome-packagekit.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-packagekit.spec	20 Oct 2008 22:15:53 -0000	1.55
+++ gnome-packagekit.spec	24 Oct 2008 09:26:32 -0000	1.56
@@ -4,7 +4,7 @@
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
 Version:   0.3.8
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -14,8 +14,11 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:    gnome-packagekit-enable-kde.patch
 
-# Upstream: 0f4e50d52c95164a1d987c42ca73cc386e51f951
-#Patch1:    gpk-dont-get-updates-when-set-to-none.patch
+# Upstream: cc6ecacb62f66bbe4ce71f14583e108d6026b20f
+Patch1:    gpk~fix-resize-small-form-factor.patch
+
+# Upstream: 95e5c1d6c104ea395c3dde9da4a6c327c05ec378
+Patch2:    gpk-untitled-window.patch
 
 Requires:  gtk2 >= 2.12.0
 Requires:  gnome-icon-theme
@@ -165,6 +168,10 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Fri Oct 24 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.8-2
+- Fix the untitled window in gpk-update-viewer. Fixes #468200
+- Fix the resize problem on small form factor devices. Fixes #467987
+
 * Mon Oct 20 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.8-1
 - New upstream version