talons

commit 974185e842e28e76d6ea1a542153e8569421eb5a
parent 1530f6a20d9f63612e1f2b9e0b37341408d7da93
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sat,  5 Jul 2008 21:19:43 +0000

2008-07-05 [paul]	3.5.0cvs13

	* src/mainwindow.c
	* src/mainwindow.h
		fix bug 1398, '"Change current account" is
		available even when there's only one account'
	* src/plugins/pgpcore/prefs_gpg.c
		put back a needed include, removed in error

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
4
++++
M
src/mainwindow.h
 | 
3
++-
M
src/plugins/pgpcore/prefs_gpg.c
 | 
1
+

6 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-05 [paul]	3.5.0cvs13
+
+	* src/mainwindow.c
+	* src/mainwindow.h
+		fix bug 1398, '"Change current account" is
+		available even when there's only one account'
+	* src/plugins/pgpcore/prefs_gpg.c
+		put back a needed include, removed in error
+
 2008-07-05 [colin]	3.5.0cvs12
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3424,3 +3424,4 @@
 ( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpcore/select-keys.c;  ) > 3.5.0cvs10.patchset
 ( cvs diff -u -r 1.101.2.51 -r 1.101.2.52 src/news.c;  cvs diff -u -r 1.2.2.25 -r 1.2.2.26 src/news_gtk.c;  ) > 3.5.0cvs11.patchset
 ( cvs diff -u -r 1.274.2.246 -r 1.274.2.247 src/mainwindow.c;  ) > 3.5.0cvs12.patchset
+( cvs diff -u -r 1.274.2.247 -r 1.274.2.248 src/mainwindow.c;  cvs diff -u -r 1.39.2.47 -r 1.39.2.48 src/mainwindow.h;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/prefs_gpg.c;  ) > 3.5.0cvs13.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -2773,6 +2773,9 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 	if (item && item->prefs->processing && selection != SUMMARY_NONE)
 		state |= M_HAVE_PROCESSING;
 
+	if (g_list_length(account_list) > 1)
+		state |= M_HAVE_MULTI_ACCOUNT;
+
 	for ( ; account_list != NULL; account_list = account_list->next) {
 		if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
 			state |= M_HAVE_NEWS_ACCOUNT;
@@ -2901,6 +2904,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 		{"/Tools/Delete duplicated messages/In selected folder"   , M_MSG_EXIST|M_ALLOW_DELETE},
 
 		{"/Configuration", M_UNLOCKED},
+		{"/Configuration/Change current account", M_HAVE_MULTI_ACCOUNT},
 		{"/Configuration/Preferences for current account...", M_UNLOCKED},
 		{"/Configuration/Create new account...", M_UNLOCKED},
 		{"/Configuration/Edit accounts...", M_UNLOCKED},
diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -61,7 +61,8 @@ typedef enum
 	M_TAGS_EXIST	      = 1 << 20,
 	M_HAVE_PROCESSING     = 1 << 21,
 	M_SUMMARY_ISLIST      = 1 << 22,
-	M_IN_MSGLIST	      = 1 << 23
+	M_IN_MSGLIST	      = 1 << 23,
+	M_HAVE_MULTI_ACCOUNT  = 1 << 24
 } SensitiveCond;
 
 typedef enum
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
@@ -22,6 +22,7 @@
 #include <glib/gi18n.h>
 
 #include "defs.h"
+#include "gtk/gtkutils.h"
 #include "utils.h" 
 #include "prefs.h"
 #include "prefs_gtk.h"