talons

commit 1e28fdf3a4a416b33a7482f596d808a13740bfbd
parent fcb417604c8715dadd5d2fdb10a298869b993f7c
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  1 Apr 2008 06:35:47 +0000

2008-04-01 [colin]	3.3.1cvs48

	* src/imap_gtk.c
		Fix bug 1561, 'Crashes leaving unsubscribed folder after
		ticking "Show only subscribed"'

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

4 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-01 [colin]	3.3.1cvs48
+
+	* src/imap_gtk.c
+		Fix bug 1561, 'Crashes leaving unsubscribed folder after 
+		ticking "Show only subscribed"'
+
 2008-03-31 [colin]	3.3.1cvs47
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3282,3 +3282,4 @@
 ( cvs diff -u -r 1.105.2.129 -r 1.105.2.130 src/prefs_account.c;  cvs diff -u -r 1.204.2.162 -r 1.204.2.163 src/prefs_common.c;  cvs diff -u -r 1.52.2.61 -r 1.52.2.62 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_quote.c;  cvs diff -u -r 1.8.2.32 -r 1.8.2.33 src/quote_fmt.c;  cvs diff -u -r 1.5.12.17 -r 1.5.12.18 src/quote_fmt.h;  ) > 3.3.1cvs45.patchset
 ( cvs diff -u -r 1.274.2.238 -r 1.274.2.239 src/mainwindow.c;  ) > 3.3.1cvs46.patchset
 ( cvs diff -u -r 1.213.2.179 -r 1.213.2.180 src/folder.c;  ) > 3.3.1cvs47.patchset
+( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/imap_gtk.c;  ) > 3.3.1cvs48.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap_gtk.c b/src/imap_gtk.c
@@ -552,6 +552,14 @@ static void subscribed_cb(FolderView *folderview, guint action,
 	if (item->folder->account->imap_subsonly == GTK_CHECK_MENU_ITEM(widget)->active)
 		return;
 
+	if (folderview->opened == folderview->selected ||
+	    gtk_ctree_is_ancestor(ctree,
+				  folderview->selected,
+				  folderview->opened)) {
+		summary_clear_all(folderview->summaryview);
+		folderview->opened = NULL;
+	}
+
 	item->folder->account->imap_subsonly = GTK_CHECK_MENU_ITEM(widget)->active;
 	folderview_fast_rescan_tree(item->folder);
 }