Fixed bug where scoring and filtering windows stopped autochecking.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 6a00f9d7bb6fbb27a24ede19a074c71b2d52df0a..513c895d6fb7b5c8ebbfd9b668973e24efeaa64f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-01-21 [melvin]    0.7.0claws21
+
+       * src/prefs_scoring.c
+       * src/prefs_filtering.c
+               Fixed bug where scoring and filtering windows stopped
+               autochecking.
+
 2002-01-21 [paul]      0.7.0claws20
 
        * sync with sylpheed 0.7.0cvs12

diff --git a/configure.in b/configure.in
index 6e8d69cd54654ed436f1edd3808a68accc6f23b1..106fc28a7c88ef8597e07a7251a7f491dd7c746a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 2bdd7689ba4cee44a39f19ad69bc4d5cf6b4e093..e772c171ae5dff5057f320613cb7535e70aa4219 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -212,7 +212,7 @@ static void prefs_matcher_exec_info_create(void);
 
 void prefs_matcher_open(MatcherList * matchers, PrefsMatcherSignal * cb)
 {
-       inc_autocheck_timer_remove();
+       inc_lock();
 
        if (!matcher.window) {
                prefs_matcher_create();
@@ -1368,6 +1368,7 @@ static void prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
 static void prefs_matcher_cancel(void)
 {
        gtk_widget_hide(matcher.window);
+       inc_unlock();
 }
 
 static void prefs_matcher_ok(void)
@@ -1375,15 +1376,13 @@ static void prefs_matcher_ok(void)
        MatcherList * matchers;
 
        matchers = prefs_matcher_get_list();
+       gtk_widget_hide(matcher.window);
+       inc_unlock();
        if (matchers != NULL) {
-               gtk_widget_hide(matcher.window);
                if (matchers_callback != NULL)
                        matchers_callback(matchers);
                matcherlist_free(matchers);
        }
-       else {
-               gtk_widget_hide(matcher.window);
-       }
 }
 
 static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,

diff --git a/src/prefs_scoring.c b/src/prefs_scoring.c
index dfd0226b15ddd3067d858216f97439355f856fdf..ff03b24ab3420acaa9ac5291cc24a932588d0a28 100644 (file)
--- a/src/prefs_scoring.c
+++ b/src/prefs_scoring.c
@@ -111,7 +111,7 @@ void prefs_scoring_open(FolderItem * item)
        if (prefs_rc_is_readonly(SCORING_RC))
                return;
 
-       inc_autocheck_timer_remove();
+       inc_lock();
 
        if (!scoring.window) {
                prefs_scoring_create();
@@ -129,7 +129,7 @@ void prefs_scoring_open(FolderItem * item)
 
 void prefs_scoring_open_with_scoring(ScoringProp * prop)
 {
-       inc_autocheck_timer_remove();
+       inc_lock();
 
        if (!scoring.window) {
                prefs_scoring_create();
@@ -744,10 +744,12 @@ static void prefs_scoring_ok(void)
        if (cur_item != NULL)
                prefs_folder_item_save_config(cur_item);
        gtk_widget_hide(scoring.window);
+       inc_unlock();
 }
 
 static void prefs_scoring_cancel(void)
 {
        prefs_matcher_read_config();
        gtk_widget_hide(scoring.window);
+       inc_unlock();
 }