[Commits] mainwindow.c 1.274.2.340 1.274.2.341 mainwindow.h 1.39.2.62 1.39.2.63 toolbar.c 1.43.2.124 1.43.2.125

[wwp at claws-mail.org]

Update of /home/claws-mail/claws/src
In directory claws-mail:/tmp/cvs-serv14554/src

Modified Files:
      Tag: gtk2
	mainwindow.c mainwindow.h toolbar.c 
Log Message:
2012-01-10 [wwp]	3.8.0cvs13

	* src/mainwindow.c
	* src/mainwindow.h
	* src/toolbar.c
		Fix sensitivity of toolbar's get_btn (retrieve mail from current
		account) and of mainwindows's relevant entry when current account
		is not able to retrieve (SMTP-only).

Index: toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/toolbar.c,v
retrieving revision 1.43.2.124
retrieving revision 1.43.2.125
diff -u -d -r1.43.2.124 -r1.43.2.125
--- toolbar.c	5 Aug 2011 06:49:15 -0000	1.43.2.124
+++ toolbar.c	10 Jan 2012 08:20:30 -0000	1.43.2.125
@@ -2348,11 +2348,11 @@
 	
 	if (toolbar->get_btn)
 		SET_WIDGET_COND(toolbar->get_btn, 
-			M_HAVE_ACCOUNT|M_UNLOCKED);
+			M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_RETRIEVABLE_ACCOUNT);
 
 	if (toolbar->getall_btn) {
 		SET_WIDGET_COND(toolbar->getall_btn, 
-			M_HAVE_ACCOUNT|M_UNLOCKED);
+			M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
 	}
 	if (toolbar->send_btn) {
 		SET_WIDGET_COND(toolbar->send_btn,

Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.340
retrieving revision 1.274.2.341
diff -u -d -r1.274.2.340 -r1.274.2.341
--- mainwindow.c	2 Dec 2011 12:50:09 -0000	1.274.2.340
+++ mainwindow.c	10 Jan 2012 08:20:30 -0000	1.274.2.341
@@ -6,12 +6,12 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -3128,6 +3128,9 @@
 	if (cur_account)
 		state |= M_HAVE_ACCOUNT;
 	
+	if (cur_account && cur_account->protocol != A_NONE)
+		state |= M_HAVE_RETRIEVABLE_ACCOUNT;
+
 	if (any_folder_want_synchronise())
 		state |= M_WANT_SYNC;
 
@@ -3138,6 +3141,13 @@
 		state |= M_HAVE_MULTI_ACCOUNT;
 
 	for ( ; account_list != NULL; account_list = account_list->next) {
+		if (((PrefsAccount*)account_list->data)->protocol != A_NONE) {
+			state |= M_HAVE_ANY_RETRIEVABLE_ACCOUNT;
+			break;
+		}
+	}
+
+	for ( ; account_list != NULL; account_list = account_list->next) {
 		if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
 			state |= M_HAVE_NEWS_ACCOUNT;
 			break;
@@ -3234,9 +3244,9 @@
 		{"Menu/View/Quotes"                    , M_SINGLE_TARGET_EXIST},
 
 		{"Menu/Message/Receive/CurrentAccount"
-						 , M_HAVE_ACCOUNT|M_UNLOCKED},
+						 , M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_RETRIEVABLE_ACCOUNT},
 		{"Menu/Message/Receive/AllAccounts"
-						 , M_HAVE_ACCOUNT|M_UNLOCKED},
+						 , M_HAVE_ACCOUNT|M_UNLOCKED|M_HAVE_ANY_RETRIEVABLE_ACCOUNT},
 		{"Menu/Message/Receive/CancelReceiving"
 						 , M_INC_ACTIVE},
 		{"Menu/Message/SendQueue"  , M_HAVE_ACCOUNT|M_HAVE_QUEUED_MAILS},

Index: mainwindow.h
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.h,v
retrieving revision 1.39.2.62
retrieving revision 1.39.2.63
diff -u -d -r1.39.2.62 -r1.39.2.63
--- mainwindow.h	19 Nov 2011 15:14:01 -0000	1.39.2.62
+++ mainwindow.h	10 Jan 2012 08:20:30 -0000	1.39.2.63
@@ -67,7 +67,9 @@
 	M_SESSION_PASSWORDS   = 1 << 26,
 	M_DELETED_EXISTS      = 1 << 27,
 	M_NOT_TRASH	      = 1 << 28,
-	M_HIDE_READ_THREADS   = 1 << 29
+	M_HIDE_READ_THREADS   = 1 << 29,
+	M_HAVE_RETRIEVABLE_ACCOUNT = 1 << 30,
+	M_HAVE_ANY_RETRIEVABLE_ACCOUNT = 1 << 31
 } SensitiveCond;
 
 typedef enum