talons

commit 5345993700332abbe8cccfed82aefdd8fd202fd7
parent 1bbf07dc81ef1eb440360b5646d45aff515ff7ec
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 18 May 2011 20:35:54 +0000

2011-05-18 [colin]	3.7.9cvs23

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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/news.c
 | 
7
+++++++

4 files changed, 15 insertions(+), 1 deletion(-)
diff --git 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
@@ -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
@@ -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
@@ -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) {