2008-06-09 [colin] 3.4.0cvs83
authorColin Leroy <colin@colino.net>
Mon, 9 Jun 2008 16:43:20 +0000 (16:43 +0000)
committerColin Leroy <colin@colino.net>
Mon, 9 Jun 2008 16:43:20 +0000 (16:43 +0000)
* src/filtering.c
Fix bug 1628, 'Claws Mail crashes when
filtering selected messages'

ChangeLog
PATCHSETS
configure.ac
src/filtering.c

index b22c936..f67e2eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-09 [colin]     3.4.0cvs83
+
+       * src/filtering.c
+               Fix bug 1628, 'Claws Mail crashes when 
+               filtering selected messages'
+
 2008-06-04 [colin]     3.4.0cvs82
 
        * src/messageview.c
index aa3b5a8..88cb47d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.274.2.245 -r 1.274.2.246 src/mainwindow.c;  cvs diff -u -r 1.39.2.46 -r 1.39.2.47 src/mainwindow.h;  ) > 3.4.0cvs80.patchset
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_message.c;  ) > 3.4.0cvs81.patchset
 ( cvs diff -u -r 1.94.2.179 -r 1.94.2.180 src/messageview.c;  ) > 3.4.0cvs82.patchset
+( cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/filtering.c;  ) > 3.4.0cvs83.patchset
index 3d98753..bff06d3 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=82
+EXTRA_VERSION=83
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 732d2f9..b3eb8b5 100644 (file)
@@ -604,8 +604,8 @@ static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *inf
                                                log_status_skip(LOG_DEBUG_FILTERING,
                                                                _("rule is account-based [id=%d, name='%s'], "
                                                                "not matching the account currently used to retrieve messages [id=%d, name='%s']\n"),
-                                                               filtering->account_id, account->account_name,
-                                                               ac_prefs->account_id, ac_prefs->account_name);
+                                                               filtering->account_id, account?account->account_name:_("NON_EXISTENT"),
+                                                               ac_prefs->account_id, ac_prefs?ac_prefs->account_name:_("NON_EXISTENT"));
                                        }
                                }
                        }
@@ -629,7 +629,7 @@ static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *inf
                                                log_status_ok(LOG_DEBUG_FILTERING,
                                                                _("rule is account-based [id=%d, name='%s'], "
                                                                "but all rules are applied on user request\n"),
-                                                               filtering->account_id, account->account_name);
+                                                               filtering->account_id, account?account->account_name:_("NON_EXISTENT"));
                                        }
                                }
                        }
@@ -647,7 +647,7 @@ static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *inf
                                                log_status_skip(LOG_DEBUG_FILTERING,
                                                                _("rule is account-based [id=%d, name='%s'], "
                                                                "skipped on user request\n"),
-                                                               filtering->account_id, account->account_name);
+                                                               filtering->account_id, account?account->account_name:_("NON_EXISTENT"));
                                        } else {
                                                log_status_skip(LOG_DEBUG_FILTERING,
                                                                _("rule is account-based, "
@@ -674,8 +674,8 @@ static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *inf
                                                log_status_skip(LOG_DEBUG_FILTERING,
                                                                _("rule is account-based [id=%d, name='%s'], "
                                                                "not matching current account [id=%d, name='%s']\n"),
-                                                               filtering->account_id, account->account_name,
-                                                               cur_account->account_id, cur_account->account_name);
+                                                               filtering->account_id, account?account->account_name:_("NON_EXISTENT"),
+                                                               cur_account->account_id, cur_account?cur_account->account_name:_("NON_EXISTENT"));
                                        } else {
                                                log_status_skip(LOG_DEBUG_FILTERING,
                                                                _("rule is account-based, "
@@ -692,8 +692,8 @@ static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *inf
                                                        log_status_ok(LOG_DEBUG_FILTERING,
                                                                        _("rule is account-based [id=%d, name='%s'], "
                                                                        "current account [id=%d, name='%s']\n"),
-                                                                       account->account_id, account->account_name,
-                                                                       cur_account->account_id, cur_account->account_name);
+                                                                       account->account_id, account?account->account_name:_("NON_EXISTENT"),
+                                                                       cur_account->account_id, cur_account?cur_account->account_name:_("NON_EXISTENT"));
                                                }
                                        }
                                }