2011-11-20 [pawel] 3.7.10cvs96

	* src/filtering.c
	* src/filtering.h
	* src/prefs_actions.c
		Fix bug #1489 'Filter action mark_as_read inoperative
		following move action'
		Sort actions lists to have proper order of execution

diff --git a/ChangeLog b/ChangeLog
index b619ae680ea23375d57518276bce7c51659ebf2c..7ea1bb0df94571eeb104a74dc5a9bea06fb4b1ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-20 [pawel]     3.7.10cvs96
+
+       * src/filtering.c
+       * src/filtering.h
+       * src/prefs_actions.c
+               Fix bug #1489 'Filter action mark_as_read inoperative
+               following move action'
+               Sort actions lists to have proper order of execution
+
 2011-11-20 [pawel]     3.7.10cvs95
 
        * src/prefs_actions.c

diff --git a/PATCHSETS b/PATCHSETS
index 8d7d381c27c95afd74c66154bd5fda4260e4fd4d..7b99b48b0d17c6d8403e6690d5533eeb6919eeb8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4299,3 +4299,4 @@
 ( cvs diff -u -r 1.1.2.59 -r 1.1.2.60 manual/advanced.xml;  ) > 3.7.10cvs93.patchset
 ( cvs diff -u -r 1.83.2.182 -r 1.83.2.183 src/mimeview.c;  ) > 3.7.10cvs94.patchset
 ( cvs diff -u -r 1.60.2.75 -r 1.60.2.76 src/prefs_actions.c;  cvs diff -u -r 1.59.2.84 -r 1.59.2.85 src/prefs_filtering.c;  cvs diff -u -r 1.12.2.79 -r 1.12.2.80 src/prefs_template.c;  ) > 3.7.10cvs95.patchset
+( cvs diff -u -r 1.60.2.58 -r 1.60.2.59 src/filtering.c;  cvs diff -u -r 1.21.2.19 -r 1.21.2.20 src/filtering.h;  cvs diff -u -r 1.60.2.76 -r 1.60.2.77 src/prefs_actions.c;  ) > 3.7.10cvs96.patchset

diff --git a/configure.ac b/configure.ac
index 974ee054c77660a8c42092b3610ce33491a88b79..516b55447f7d1ce94a1600801ef1eff75c62eab5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=95
+EXTRA_VERSION=96
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/filtering.c b/src/filtering.c
index 22fc9b62fea4f25da6d459ecc16bc0766c8ebf14..8e6f66a9c367d1eb852ef593eb6c60b15723943e 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -93,6 +93,19 @@ void filteringaction_free(FilteringAction * action)
        g_free(action);
 }
 
+static gint action_list_sort(gconstpointer a, gconstpointer b)
+{
+       int first  = filtering_is_final_action((FilteringAction *) a) ? 1 : 0;
+       int second = filtering_is_final_action((FilteringAction *) b) ? 1 : 0;
+       
+       return (first - second);
+}
+
+GSList *filtering_action_list_sort(GSList *action_list)
+{
+       return g_slist_sort(action_list, action_list_sort);
+}
+
 FilteringProp * filteringprop_new(gboolean enabled,
                                  const gchar *name,
                                  gint account_id,
@@ -106,7 +119,7 @@ FilteringProp * filteringprop_new(gboolean enabled,
        filtering->name = name ? g_strdup(name): NULL;
        filtering->account_id = account_id;
        filtering->matchers = matchers;
-       filtering->action_list = action_list;
+       filtering->action_list = filtering_action_list_sort(action_list);
 
        return filtering;
 }

diff --git a/src/filtering.h b/src/filtering.h
index 011aae6be522d0c04fce2bc615077908610656a2..31ba325e90add0ecd2e701d90b3dbe9788aca250 100644 (file)
--- a/src/filtering.h
+++ b/src/filtering.h
@@ -106,4 +106,6 @@ extern GSList * post_global_processing;
 
 gboolean filtering_peek_per_account_rules(GSList *filtering_list);
 
+GSList *filtering_action_list_sort(GSList *action_list);
+
 #endif

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index e942d08d4d1dd3c192ad38b982450493a6990e5a..c1b90b2a8aa99538e81b6ee0064d4f7bfd40ffe1 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1324,6 +1324,7 @@ static void prefs_action_define_filter_done(GSList * action_list)
        if (action_list == NULL)
                return;
 
+       action_list = filtering_action_list_sort(action_list);
        str = filteringaction_list_to_string(action_list);
 
        if (str != NULL) {