Merge lp:~chrisccoulson/nautilus/bug362771 into lp:~ubuntu-desktop/nautilus/ubuntu

[Chris Coulson]

=== modified file 'debian/changelog'
--- debian/changelog	2009-04-16 13:43:03 +0000
+++ debian/changelog	2009-04-20 22:52:17 +0000
@@ -1,9 +1,15 @@
 nautilus (1:2.26.2-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Michael Vogt ]
   * debian/patches/82_gnome-app-install.patch:
    - re-enable the mime search functionality (LP: #362307)
 
- -- Michael Vogt <[e-mail]>  Thu, 16 Apr 2009 14:51:09 +0200
+  [ Chris Coulson ]
+  * debian/patches/18_svn_r15184_fix_icon_view_zoom.patch:
+    - Patch from SVN to take zoom in to account when updating
+      the scroll width (LP: #362771). 
+
+ -- Chris Coulson <[e-mail]>  Mon, 20 Apr 2009 23:34:59 +0100
 
 nautilus (1:2.26.2-0ubuntu1) jaunty; urgency=low
 

=== added file 'debian/patches/18_svn_r15184_fix_icon_view_zoom.patch'
--- debian/patches/18_svn_r15184_fix_icon_view_zoom.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/18_svn_r15184_fix_icon_view_zoom.patch	2009-04-20 22:52:17 +0000
@@ -0,0 +1,30 @@
+# Excessive white-space on right-hand side in icon view
+# When using at allocation->width, take zoom into account
+# Launchpad: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/362771
+# Bugzilla: http://bugzilla.gnome.org/show_bug.cgi?id=579086
+
+Index: nautilus-2.26.2/libnautilus-private/nautilus-icon-container.c
+===================================================================
+--- nautilus-2.26.2.orig/libnautilus-private/nautilus-icon-container.c	2009-04-20 23:31:26.000000000 +0100
++++ nautilus-2.26.2/libnautilus-private/nautilus-icon-container.c	2009-04-20 23:31:36.000000000 +0100
+@@ -1033,9 +1033,9 @@
+ 	GtkAllocation *allocation;
+ 	gboolean reset_scroll_region;
+ 
+-	if (nautilus_icon_container_get_is_fixed_size (container)) {
+-		pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
++	pixels_per_unit = EEL_CANVAS (container)->pixels_per_unit;
+ 
++	if (nautilus_icon_container_get_is_fixed_size (container)) {
+ 		/* 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

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-04-16 13:43:03 +0000
+++ debian/patches/series	2009-04-20 22:52:17 +0000
@@ -12,6 +12,7 @@
 15_translations_list_update.patch
 16_workaround_autorestart_issue.patch
 17_no_autorun_launcher.patch
+18_svn_r15184_fix_icon_view_zoom.patch
 80_suppress_umount_in_ltsp.patch
 82_gnome-app-install.patch
 95_no-initial-fade.patch