talons

commit d64fc5305c26760c3f0d2a797551f41459682c0d
parent 8c10a3ae90fc1384ba7a6d74acba52867769ed2e
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 31 Mar 2008 06:47:40 +0000

2008-03-31 [colin]	3.3.1cvs46

	* src/mainwindow.c
		Fix tags menu update, thanks to Paul

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

4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-31 [colin]	3.3.1cvs46
+
+	* src/mainwindow.c
+		Fix tags menu update, thanks to Paul
+
 2008-03-29 [wwp]	3.3.1cvs45
 
 	* src/prefs_account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3280,3 +3280,4 @@
 ( cvs diff -u -r 1.60.2.113 -r 1.60.2.114 src/addressbook.c;  ) > 3.3.1cvs43.patchset
 ( cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/common/prefs.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/xmlprops.c;  ) > 3.3.1cvs44.patchset
 ( 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
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=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -2114,9 +2114,10 @@ static gboolean main_window_reflect_tags_changes_real(gpointer data)
 	GList *cur;
 	MainWindow *mainwin = (MainWindow *)data;
 
-	if (summary_is_locked(mainwin->summaryview))
+	if (summary_is_locked(mainwin->summaryview)) {
+		tags_tag = 0;
 		return TRUE;
-
+	}
 	/* re-create tags submenu */
 	menu = GTK_MENU_SHELL(mainwin->tags_menu);
 	g_return_val_if_fail(menu != NULL, FALSE);
@@ -2128,6 +2129,7 @@ static gboolean main_window_reflect_tags_changes_real(gpointer data)
 	mainwindow_tags_menu_create(mainwin, TRUE);
 	summary_reflect_tags_changes(mainwin->summaryview);
 	
+	tags_tag = 0;
 	return FALSE;
 }