rpms/nautilus/F-11 nautilus-2.26.2-icon-whitespace.patch, NONE, 1.1 nautilus.spec, 1.270, 1.271 sources, 1.99, 1.100

[Alexander Larsson]

Author: alexl

Update of /cvs/pkgs/rpms/nautilus/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11939

Modified Files:
	nautilus.spec sources 
Added Files:
	nautilus-2.26.2-icon-whitespace.patch 
Log Message:
* Thu Apr 16 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-2
- Fix excessive whitespace on the right in icon view when zooming
- Fixes Gnome bug #579086


nautilus-2.26.2-icon-whitespace.patch:

--- NEW FILE nautilus-2.26.2-icon-whitespace.patch ---
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
--- libnautilus-private/nautilus-icon-container.c	(revision 15183)
+++ libnautilus-private/nautilus-icon-container.c	(revision 15184)
@@ -1033,9 +1033,9 @@
 	GtkAllocation *allocation;
 	gboolean reset_scroll_region;
 
+	pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
+
 	if (nautilus_icon_container_get_is_fixed_size (container)) {
-		pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
-
 		/* Set the scroll region to the size of the container allocation */
 		allocation = &GTK_WIDGET (container)->allocation;
 		eel_canvas_set_scroll_region
@@ -1090,7 +1090,7 @@
 	if (nautilus_icon_container_is_auto_layout (container)) {
 		allocation = &GTK_WIDGET (container)->allocation;
 		x1 = MIN (x1, 0);
-		x2 = MAX (x2, allocation->width);
+		x2 = MAX (x2, allocation->width / pixels_per_unit);
 		y1 = 0;
 	} else {
 		/* Otherwise we add the padding that is at the start of the


Index: nautilus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/F-11/nautilus.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- nautilus.spec	13 Apr 2009 19:50:18 -0000	1.270
+++ nautilus.spec	16 Apr 2009 09:15:30 -0000	1.271
@@ -16,7 +16,7 @@
 Name:		nautilus
 Summary:        File manager for GNOME
 Version: 	2.26.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
@@ -87,6 +87,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
+# From svn (rev 15184)
+Patch18:	nautilus-2.26.2-icon-whitespace.patch
+
 %description
 Nautilus is the file manager and graphical shell for the GNOME desktop
 that makes it easy to manage your files and the rest of your system.
@@ -124,6 +127,7 @@
 # %patch8 -p1 -b .hide-white-screen
 %patch10 -p1 -b .gvfs-desktop-key
 %patch17 -p0 -b .symlink
+%patch18 -p0 -b .whitespace
 
 %build
 
@@ -261,6 +265,10 @@
 
 
 %changelog
+* Thu Apr 16 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-2
+- Fix excessive whitespace on the right in icon view when zooming
+- Fixes Gnome bug #579086
+
 * Mon Apr 13 2009 Alexander Larsson <alexl at redhat.com> - 2.26.2-1
 - Update to 2.26.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus/F-11/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	13 Apr 2009 19:50:18 -0000	1.99
+++ sources	16 Apr 2009 09:15:30 -0000	1.100
@@ -1,2 +1 @@
-5d75f5de2806e9003e36a4613866b8d1  nautilus-2.26.1.tar.bz2
 6b9292ed9dde8b5f86a3b6df1422d5f8  nautilus-2.26.2.tar.bz2