[Commits] mainwindow.c 1.274.2.361 1.274.2.362 mainwindow.h 1.39.2.67 1.39.2.68 summaryview.c 1.395.2.459 1.395.2.460 toolbar.c 1.43.2.134 1.43.2.135

[wwp at claws-mail.org]

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

Modified Files:
      Tag: gtk2
	mainwindow.c mainwindow.h summaryview.c toolbar.c 
Log Message:
2012-11-30 [wwp]	3.9.0cvs32

	* src/mainwindow.c
	* src/mainwindow.h
	* src/summaryview.c
	* src/toolbar.c
	Fix wrong types used (mix between SensitiveCond and SensitiveCondMask),
	also fix list loop initializers.

Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.459
retrieving revision 1.395.2.460
diff -u -d -r1.395.2.459 -r1.395.2.460
--- summaryview.c	28 Nov 2012 15:33:13 -0000	1.395.2.459
+++ summaryview.c	30 Nov 2012 15:20:26 -0000	1.395.2.460
@@ -1709,7 +1709,7 @@
 
 void summary_set_menu_sensitive(SummaryView *summaryview)
 {
-	SensitiveCond state;
+	SensitiveCondMask state;
 	gboolean sensitive;
 	gint i;
 

Index: toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/toolbar.c,v
retrieving revision 1.43.2.134
retrieving revision 1.43.2.135
diff -u -d -r1.43.2.134 -r1.43.2.135
--- toolbar.c	30 Nov 2012 14:25:12 -0000	1.43.2.134
+++ toolbar.c	30 Nov 2012 15:20:26 -0000	1.43.2.135
@@ -2380,7 +2380,7 @@
 
 void toolbar_main_set_sensitive(gpointer data)
 {
-	SensitiveCond state;
+	SensitiveCondMask state;
 	gboolean sensitive;
 	MainWindow *mainwin = (MainWindow*)data;
 	Toolbar *toolbar = mainwin->toolbar;

Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.361
retrieving revision 1.274.2.362
diff -u -d -r1.274.2.361 -r1.274.2.362
--- mainwindow.c	30 Nov 2012 14:25:12 -0000	1.274.2.361
+++ mainwindow.c	30 Nov 2012 15:20:26 -0000	1.274.2.362
@@ -3117,9 +3117,9 @@
 	folder_set_ui_func(folder, NULL, NULL);
 }
 
-SensitiveCond main_window_get_current_state(MainWindow *mainwin)
+SensitiveCondMask main_window_get_current_state(MainWindow *mainwin)
 {
-	SensitiveCond state = 0;
+	SensitiveCondMask state = 0;
 	SummarySelection selection;
 	FolderItem *item = mainwin->summaryview->folder_item;
 	GList *account_list = account_get_list();
@@ -3204,14 +3204,14 @@
 	if (g_list_length(account_list) > 1)
 		UPDATE_STATE(M_HAVE_MULTI_ACCOUNT);
 
-	for ( ; account_list != NULL; account_list = account_list->next) {
+	for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
 		if (((PrefsAccount*)account_list->data)->protocol != A_NONE) {
 			UPDATE_STATE(M_HAVE_ANY_RETRIEVABLE_ACCOUNT);
 			break;
 		}
 	}
 
-	for ( ; account_list != NULL; account_list = account_list->next) {
+	for (account_list = account_get_list(); account_list != NULL; account_list = account_list->next) {
 		if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
 			UPDATE_STATE(M_HAVE_NEWS_ACCOUNT);
 			break;
@@ -3289,7 +3289,7 @@
 
 void main_window_set_menu_sensitive(MainWindow *mainwin)
 {
-	SensitiveCond state;
+	SensitiveCondMask state;
 	gboolean sensitive;
 	SummaryView *summaryview;
 	gchar *menu_path;
@@ -3301,7 +3301,7 @@
 #define N_ENTRIES 82
 	static struct {
 		const gchar *entry;
-		SensitiveCond cond;
+		SensitiveCondMask cond;
 	} entry[N_ENTRIES];
 
 	i = 0;

Index: mainwindow.h
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.h,v
retrieving revision 1.39.2.67
retrieving revision 1.39.2.68
diff -u -d -r1.39.2.67 -r1.39.2.68
--- mainwindow.h	30 Nov 2012 14:25:12 -0000	1.39.2.67
+++ mainwindow.h	30 Nov 2012 15:20:26 -0000	1.39.2.68
@@ -189,7 +189,7 @@
 					 gboolean	 confirm,
 					 gboolean 	 for_quit);
 
-guint64 main_window_get_mask(SensitiveCond cond, ...);
+SensitiveCondMask main_window_get_mask(SensitiveCond cond, ...);
 
 void main_window_set_menu_sensitive	(MainWindow	*mainwin);
 
@@ -198,7 +198,7 @@
 void main_window_hide			(MainWindow 	*mainwin);
 void main_window_popup			(MainWindow	*mainwin);
 
-SensitiveCond main_window_get_current_state   (MainWindow *mainwin);
+SensitiveCondMask main_window_get_current_state   (MainWindow *mainwin);
 
 void toolbar_set_compose_button               (Toolbar		 *toolbar, 
 					       ComposeButtonType  compose_btn_type);