Merge lp:~barry/ubuntu/natty/claws-mail/bug-724416 into lp:ubuntu/natty/claws-mail

[Barry Warsaw]

This patch from upstream CVS fixes the double appending of sent messages to the Sent folder.

[Evan Broder (broder)]

This patch looks fine, but ugh the claws-mail branch is thoroughly massive. This coffeeshop's wifi isn't cutting it.

In the mean time, the one issue I see is that 60upstream_bug_2325_fix.patch doesn't have a DEP-3 header, which is a better place to put patch provenance information than the changelog.

I'm going to take another look at this when I get home. In the interests of expediency, there's enough information here that I'll go ahead and write up the DEP-3 header when I do so, if you haven't had a chance to by then.

review: Needs Fixing

[Barry Warsaw (barry)]

On Mar 03, 2011, at 03:32 AM, Evan Broder wrote:

>Review: Needs Fixing
>This patch looks fine, but ugh the claws-mail branch is thoroughly massive. This coffeeshop's wifi isn't cutting it.
>
>In the mean time, the one issue I see is that 60upstream_bug_2325_fix.patch doesn't have a DEP-3 header, which is a better place to put patch provenance information than the changelog.
>
>I'm going to take another look at this when I get home. In the interests of
>expediency, there's enough information here that I'll go ahead and write up
>the DEP-3 header when I do so, if you haven't had a chance to by then.

Apologies, it was late and I neglected to add the DEP-3 headers. I just
pushed a branch update which contains them in the style of other patches in
this package (i.e. prepend each line with '#'). However I see the branch has
been merged and pushed.

Thanks for that! If you feel like it, please do merge and push the updated
patch DEP3 headers.

Cheers.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-12-14 17:17:07 +0000
+++ .pc/applied-patches	2011-03-03 02:26:55 +0000
@@ -2,3 +2,4 @@
 12fix_manpage_header.patch
 50disable_can_change_accels_by_default
 13fix_manpage_hyphens.patch
+60upstream_bug_2325_fix.patch
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-01-21 19:02:33 +0000
+++ debian/changelog	2011-03-03 02:26:55 +0000
@@ -1,3 +1,12 @@
+claws-mail (3.7.8-1ubuntu4) natty; urgency=low
+
+  * 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)
+
+ -- Barry Warsaw <[e-mail]>  Wed, 02 Mar 2011 21:20:49 -0500
+
 claws-mail (3.7.8-1ubuntu3) natty; urgency=low
 
   * debian/claws-mail.desktop: Pass mailto: URL to claws-mail executable
 
=== 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-03 02:26:55 +0000
@@ -0,0 +1,20 @@
+--- 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)
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-14 17:17:07 +0000
+++ debian/patches/series	2011-03-03 02:26:55 +0000
@@ -2,3 +2,4 @@
 12fix_manpage_header.patch
 50disable_can_change_accels_by_default
 13fix_manpage_hyphens.patch
+60upstream_bug_2325_fix.patch
 
=== modified file 'src/folder.c'
--- src/folder.c	2010-12-14 17:17:07 +0000
+++ src/folder.c	2011-03-03 02:26:55 +0000
@@ -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)