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

diff --git a/ChangeLog b/ChangeLog
index 04291fb6c9475549aeac84358663482ff7bf2345..3aabc747684e94bd1c8f3920d9417bd3ed02a651 100644 (file)
--- 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
index ec4ce1b9a46c82205bc47b7e976923b447e4ba18..a1b1e056032e327d2a82005ee64316944a5ea7d7 100644 (file)
--- 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
index b02e50882bc15a5dc50e9c0e48d267c887a8b6cf..9caefd945034d82c0640d3600c2e937a6d80bc82 100644 (file)
--- 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
index 953fe3525e4c047c99c747a8cb99d4ed75fd5cd4..7aacb2df2d0ec928b2b1ddcf54555afc0048219f 100644 (file)
--- 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
index 672df6e29a863288df5a8fb58bfcdc17f1d95eda..b63b6b16d6488fa3fd0b64eb4f24c260cc323dd2 100644 (file)
--- 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
index 67843c27d5f44e9ba9d78011f47e3856afe84993..18e7fc7f55d85b3dd2b03ec8fb3032e3b3b21f12 100644 (file)
--- 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"