Merge lp:~ubuntu-branches/ubuntu/natty/claws-mail/natty-201103250225 into lp:ubuntu/natty/claws-mail

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/claws-mail now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/claws-mail/natty-201103250225. A merge should be performed if necessary.

Unmerged revisions

42. By Evan Broder on 2011-03-03

debian/patches/60upstream_bug_2325_fix.patch: Upstream suggested
patch to fix appending of duplicate messages to sent folder.
http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2376
(LP: #724416)

=== added file 'debian/patches/60upstream_bug_2325_fix.patch'
--- debian/patches/60upstream_bug_2325_fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/60upstream_bug_2325_fix.patch	2011-03-28 07:14:21 +0000
@@ -0,0 +1,26 @@
+Description: Remove message from folder cache after moving from MH to IMAP boxes
+Origin: upstream, http://colino.net/claws-mail/getpatchset.php?ver=3.7.8cvs7
+Bug: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2376
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/claws-mail/+bug/724416
+Author: Colin Leroy <[e-mail]>
+
+--- a/src/folder.c
++++ b/src/folder.c
+@@ -3492,7 +3492,7 @@
+             		if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data))
+ 	            	        num = GPOINTER_TO_INT(data);
+ 			else
+-				num = -1;
++				num = 0;
+ 
+ 			if (g_slist_find(not_moved, msginfo))
+ 				continue;
+@@ -3539,7 +3539,7 @@
+                 if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data))
+ 	                num = GPOINTER_TO_INT(data);
+ 		else
+-			num = -1;
++			num = 0;
+ 
+ 		statusbar_progress_all(curmsg++,total, 100);
+ 		if (curmsg % 100 == 0)

=== renamed file 'debian/patches/60upstream_bug_2325_fix.patch' => 'debian/patches/60upstream_bug_2325_fix.patch.moved'