2008-10-08 [paul] 3.6.0cvs17

	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
		enable re-ordering of the filtering/processing
		condition and actions lists by drag'n'drop

diff --git a/ChangeLog b/ChangeLog
index c43a6e87d7764d4c0607e9bc1bad122ef71b6380..417d42c9ba4cf5e7c6cc7b039a4d8df737586d4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-08 [paul]      3.6.0cvs17
+
+       * src/prefs_filtering_action.c
+       * src/prefs_matcher.c
+               enable re-ordering of the filtering/processing
+               condition and actions lists by drag'n'drop
+
 2008-10-08 [colin]     3.6.0cvs16
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 1b334d1b29a0d8b5e81b224e5838e6ccccda3701..77fe2c84e587fb17d4f40144e2256dd6a389199b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3573,3 +3573,4 @@
 ( cvs diff -u -r 1.179.2.233 -r 1.179.2.234 src/imap.c;  ) > 3.6.0cvs14.patchset
 ( cvs diff -u -r 1.179.2.234 -r 1.179.2.235 src/imap.c;  ) > 3.6.0cvs15.patchset
 ( cvs diff -u -r 1.60.2.125 -r 1.60.2.126 src/addressbook.c;  ) > 3.6.0cvs16.patchset
+( cvs diff -u -r 1.1.4.56 -r 1.1.4.57 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.77 -r 1.43.2.78 src/prefs_matcher.c;  ) > 3.6.0cvs17.patchset

diff --git a/configure.ac b/configure.ac
index 73c2e72b685eeeaaad4d7684c9885d230eea80d1..1b0641f5dd9ea73ecc0bc9f74d88bf705606fd67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index c318f7a721d5851765113088d684b71531b72ba7..5536c842b32dc3bd95c4e305f284a9bec7c2bfba 100644 (file)
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -1431,6 +1431,7 @@ static GtkWidget *prefs_filtering_action_list_view_create(void)
        g_object_unref(model);  
        
        gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
 
        selector = gtk_tree_view_get_selection(list_view);
        gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 0626f2e09d677fe1b911673b7e2fd6bda67441f1..0bde97e0784078de3d373d28261263fed4503629 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -2119,6 +2119,7 @@ static GtkWidget *prefs_matcher_list_view_create(void)
        g_object_unref(model);  
        
        gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
        
        selector = gtk_tree_view_get_selection(list_view);
        gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);