fix 'Create filter rule' bug

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9e8b6672ef2acc23fb521a94472357faf83e405b..1713db8d7c2887ac2950d7f47694a550e6cfc49a 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2002-10-31 [paul]      0.8.5claws60
+
+       * src/summaryview.c
+               remove check for global_processing in summary_filter_open(). 
+               This fixes the bug where if the user uses the right-click 
+               'Create filter rule...' and doesn't have any filter rules 
+               already defined in claws' advanced filtering, the newly 
+               created filter rule goes to main's filtering which is 
+               inaccessible through the gui. Now the filter rule gets added
+               to claws' filtering by default.
+
 2002-10-28 [melvin]    0.8.5claws59
 
        * src/prefs_actions.c

diff --git a/configure.in b/configure.in
index 4f2a7263cbd23aa90624ce8862b470a288f670bb..95edb5aa0fef23dd5be2b722d2538552da7e5071 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws59
+EXTRA_VERSION=claws60
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/summaryview.c b/src/summaryview.c
index f44746cc096bdcd8c3914ebb9325666e6c84c624..ea9e54577397179631d51c53a9f24963782372c8 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3935,14 +3935,8 @@ void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
                                              summaryview->selected);
        if (!msginfo) return;
 
-       if (global_processing) {
-               header_offset = 1;
-               hentry_offset = 5;
-       }
-       else {
-               header_offset = 0;
-               hentry_offset = 0;
-       }
+       header_offset = 1;
+       hentry_offset = 5;
 
        switch (type) {
        case FILTER_BY_NONE:
@@ -4006,10 +4000,7 @@ void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
         * and have set entries. Otherwise we're hosed.  
         */
 
-       if (global_processing)
-               prefs_filtering_open(NULL, header, key);
-       else
-               prefs_filter_open(header, key);
+       prefs_filtering_open(NULL, header, key);
 }
 
 void summary_reply(SummaryView *summaryview, ComposeMode mode)