2011-05-18 [colin] 3.7.9cvs23

	* src/news.c
		Fix missing group selection before xover if the
		connection was reset before.

diff --git a/ChangeLog b/ChangeLog
index 6c93b180fa9e2b0c3f4f68babfe6491a1dbd3f7b..df53e32e0381f3ab4929069fbb27e775accf612e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-18 [colin]     3.7.9cvs23
+
+       * src/news.c
+               Fix missing group selection before xover if the
+               connection was reset before.
+
 2011-05-12 [colin]     3.7.9cvs22
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index 227f757777abcc69bba3473075bc7ae127318b69..4943e036e2e9073227eb3af7eb288049db97cf69 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4174,3 +4174,4 @@
 ( cvs diff -u -r 1.274.2.323 -r 1.274.2.324 src/mainwindow.c;  cvs diff -u -r 1.52.2.82 -r 1.52.2.83 src/prefs_folder_item.c;  ) > 3.7.9cvs20.patchset
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/etpan/nntp-thread.c;  ) > 3.7.9cvs21.patchset
 ( cvs diff -u -r 1.36.2.192 -r 1.36.2.193 src/common/utils.c;  ) > 3.7.9cvs22.patchset
+( cvs diff -u -r 1.101.2.65 -r 1.101.2.66 src/news.c;  ) > 3.7.9cvs23.patchset

diff --git a/configure.ac b/configure.ac
index 78940c73e5dfa725e48b4191ea9d2e70586f7958..0b64aeb622c0aa46f08d46db87ddfeebaf5b8fbc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/news.c b/src/news.c
index e8380cdaf20385ab85969edb08effca7a0ff59cc..c79a6bec5aed483c7e34991125a80fb36b4a8eae 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -1141,6 +1141,13 @@ static GSList *news_get_msginfos_for_range(NewsSession *session, FolderItem *ite
 
        news_folder_lock(NEWS_FOLDER(item->folder));
        
+       ok = news_select_group(item->folder, item->path, NULL, NULL, NULL);
+       if (ok != NEWSNNTP_NO_ERROR) {
+               log_warning(LOG_PROTOCOL, _("couldn't set group: %s\n"), item->path);
+               news_folder_unlock(NEWS_FOLDER(item->folder));
+               return NULL;
+       }
+
        ok = nntp_threaded_xover(item->folder, begin, end, NULL, &msglist);
        
        if (ok != NEWSNNTP_NO_ERROR) {