From 8f5b92b45a9d48625b8c0b8fc0df8d53b0951761 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 6 Dec 2006 07:20:34 +0000 Subject: [PATCH] 2006-12-06 [colin] 2.6.1cvs6 * src/folderview.c Fix bug 1072, 'Claws stops fetching newsgroups from server when newsgroup got deleted': continue checking other groups --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folderview.c | 14 ++++++++++---- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 668d25657..23c8e6782 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-06 [colin] 2.6.1cvs6 + + * src/folderview.c + Fix bug 1072, 'Claws stops fetching newsgroups + from server when newsgroup got deleted': continue + checking other groups + 2006-12-05 [wwp] 2.6.1cvs5 * src/message_search.c diff --git a/PATCHSETS b/PATCHSETS index eb49cab73..c80f04612 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2113,3 +2113,4 @@ ( cvs diff -u -r 1.30.2.14 -r 1.30.2.15 tools/README; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/textviewer.pl; ) > 2.6.1cvs3.patchset ( cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/wizard.c; ) > 2.6.1cvs4.patchset ( cvs diff -u -r 1.3.12.20 -r 1.3.12.21 src/message_search.c; cvs diff -u -r 1.15.2.38 -r 1.15.2.39 src/summary_search.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/combobox.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/combobox.h; cvs diff -u -r 1.5.2.45 -r 1.5.2.46 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.27 -r 1.4.2.28 src/gtk/gtkutils.h; ) > 2.6.1cvs5.patchset +( cvs diff -u -r 1.207.2.136 -r 1.207.2.137 src/folderview.c; ) > 2.6.1cvs6.patchset diff --git a/configure.ac b/configure.ac index 379662d1e..00cbd3001 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=5 +EXTRA_VERSION=6 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folderview.c b/src/folderview.c index 52e2453ef..2a1e0c1b2 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -1168,10 +1168,16 @@ gint folderview_check_new(Folder *folder) item->opened == TRUE || item->processing_pending == TRUE)) { if (folder_item_scan(item) < 0) { - summaryview_unlock(folderview->summaryview, item); - if (folder && !FOLDER_IS_LOCAL(folder)) { - STATUSBAR_POP(folderview->mainwin); - break; + if (folder) { + summaryview_unlock(folderview->summaryview, item); + if (FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) { + log_error(_("Couldn't scan folder %s\n"), + item->path ? item->path:item->name); + continue; + } else if (!FOLDER_IS_LOCAL(folder)) { + STATUSBAR_POP(folderview->mainwin); + break; + } } } } else if (!item->folder->klass->scan_required) { -- 2.25.1