Merge lp:~3v1n0/ubuntu/oneiric/nautilus/unity-progress-fix-overflow into lp:~ubuntu-desktop/nautilus/ubuntu

[Marco Trevisan (Treviño)]

Fixed the bug #845188 that in 32bit systems (mostly) lead to get a bad progress computation for the unity launcher progressbar due to an overflow.

Unfortunately this was a really stupid typo that I left in the patch, but that has a really bad effect.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-27 06:24:09 +0000
+++ debian/changelog	2011-09-29 03:26:23 +0000
@@ -1,3 +1,11 @@
+nautilus (1:3.2.0-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/12_unity_launcher_support.patch:
+    - Fixed a typo that lead to bad computation of progress for
+      files with size >= 2GB due to a type overflow (LP: #845188)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 29 Sep 2011 05:09:47 +0200
+
 nautilus (1:3.2.0-0ubuntu2) oneiric; urgency=low
 
   * debian/control.in: Bump libglib2.0-dev build dependency to ensure that we

=== modified file 'debian/patches/12_unity_launcher_support.patch'
--- debian/patches/12_unity_launcher_support.patch	2011-09-19 20:03:37 +0000
+++ debian/patches/12_unity_launcher_support.patch	2011-09-29 03:26:23 +0000
@@ -78,7 +78,7 @@
 +double
 +nautilus_progress_info_get_current (NautilusProgressInfo *info)
 +{
-+	int current;
++	double current;
 +	
 +	G_LOCK (progress_info);
 +
@@ -96,7 +96,7 @@
 +double
 +nautilus_progress_info_get_total (NautilusProgressInfo *info)
 +{
-+	int total;
++	double total;
 +	
 +	G_LOCK (progress_info);
 +