2005-04-10 [colin] 1.9.6cvs32

	* src/filtering.c
		Copy score when copying FilteringActions
		Fix bug #674

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 6634253608cc23ec77aebbb630cb77d843ac0849..f02f172aee99c1ce5e7a144f6ba9437981204352 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-04-10 [colin]     1.9.6cvs32
+
+       * src/filtering.c
+               Copy score when copying FilteringActions
+               Fix bug #674
+

 2005-04-10 [colin]     1.9.6cvs31
 
        * src/inc.c
 2005-04-10 [colin]     1.9.6cvs31
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index 6f3f55516fb5a542e279fc2feeaf08387191157b..f5bf1bd33417dfce0a19f4350a42b390252e62ce 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -448,3 +448,4 @@
 ( cvs diff -u -r 1.61.2.22 -r 1.61.2.23 src/account.c; cvs diff -u -r 1.105.2.19 -r 1.105.2.20 src/prefs_account.c; cvs diff -u -r 1.49.2.9 -r 1.49.2.10 src/prefs_account.h; ) > 1.9.6cvs29.patchset
 ( cvs diff -u -r 1.105.2.20 -r 1.105.2.21 src/prefs_account.c; cvs diff -u -r 1.382.2.116 -r 1.382.2.117 src/compose.c; ) > 1.9.6cvs30.patchset
 ( cvs diff -u -r 1.149.2.21 -r 1.149.2.22 src/inc.c; ) > 1.9.6cvs31.patchset
 ( cvs diff -u -r 1.61.2.22 -r 1.61.2.23 src/account.c; cvs diff -u -r 1.105.2.19 -r 1.105.2.20 src/prefs_account.c; cvs diff -u -r 1.49.2.9 -r 1.49.2.10 src/prefs_account.h; ) > 1.9.6cvs29.patchset
 ( cvs diff -u -r 1.105.2.20 -r 1.105.2.21 src/prefs_account.c; cvs diff -u -r 1.382.2.116 -r 1.382.2.117 src/compose.c; ) > 1.9.6cvs30.patchset
 ( cvs diff -u -r 1.149.2.21 -r 1.149.2.22 src/inc.c; ) > 1.9.6cvs31.patchset

+( cvs diff -u -r 1.60.2.5 -r 1.60.2.6 src/filtering.c; ) > 1.9.6cvs32.patchset

diff --git a/configure.ac b/configure.ac
index 6e10ba39b43ffa78f62dd4b8da74b0a205f861cb..989e56a9f317cd5fe8460dcfdad0316b07983cff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=31
+EXTRA_VERSION=32

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/filtering.c b/src/filtering.c
index 2e988e7cd4f3292e4a3d6fdcc4ca2719bddffb1f..a6ff6661e912e38469ad8cf97c13263891301e44 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -108,6 +108,7 @@ static FilteringAction * filteringaction_copy(FilteringAction * src)
        else 
                new->destination = NULL;
        new->labelcolor = src->labelcolor;
        else 
                new->destination = NULL;
        new->labelcolor = src->labelcolor;

+       new->score = src->score;

 
         return new;
 }
 
         return new;
 }