talons

commit f1c08b4f36d9ed5fa62672f1d0e060fb59c282b4
parent 931e462dbf95b1d2a260bc5ad756a8d5847cd489
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Fri, 30 Nov 2012 15:20:26 +0000

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.

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
12
++++++------
M
src/mainwindow.h
 | 
4
++--
M
src/summaryview.c
 | 
2
+-
M
src/toolbar.c
 | 
2
+-

7 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2012-11-30 [wwp]	3.9.0cvs31
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4529,3 +4529,4 @@
 ( cvs diff -u -r 1.274.2.358 -r 1.274.2.359 src/mainwindow.c;  cvs diff -u -r 1.39.2.65 -r 1.39.2.66 src/mainwindow.h;  cvs diff -u -r 1.395.2.458 -r 1.395.2.459 src/summaryview.c;  cvs diff -u -r 1.43.2.132 -r 1.43.2.133 src/toolbar.c;  ) > 3.9.0cvs29.patchset
 ( cvs diff -u -r 1.274.2.359 -r 1.274.2.360 src/mainwindow.c;  ) > 3.9.0cvs30.patchset
 ( cvs diff -u -r 1.274.2.360 -r 1.274.2.361 src/mainwindow.c;  cvs diff -u -r 1.39.2.66 -r 1.39.2.67 src/mainwindow.h;  cvs diff -u -r 1.150.2.132 -r 1.150.2.133 src/procmsg.c;  cvs diff -u -r 1.17.2.66 -r 1.17.2.67 src/send_message.c;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/send_message.h;  cvs diff -u -r 1.43.2.133 -r 1.43.2.134 src/toolbar.c;  cvs diff -u -r 1.19.2.35 -r 1.19.2.36 src/toolbar.h;  ) > 3.9.0cvs31.patchset
+( cvs diff -u -r 1.274.2.361 -r 1.274.2.362 src/mainwindow.c;  cvs diff -u -r 1.39.2.67 -r 1.39.2.68 src/mainwindow.h;  cvs diff -u -r 1.395.2.459 -r 1.395.2.460 src/summaryview.c;  cvs diff -u -r 1.43.2.134 -r 1.43.2.135 src/toolbar.c;  ) > 3.9.0cvs32.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=32
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3117,9 +3117,9 @@ static void main_window_add_mailbox(MainWindow *mainwin)
 	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 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 	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 @@ SensitiveCondMask main_window_get_mask(SensitiveCond cond, ...)
 
 void main_window_set_menu_sensitive(MainWindow *mainwin)
 {
-	SensitiveCond state;
+	SensitiveCondMask state;
 	gboolean sensitive;
 	SummaryView *summaryview;
 	gchar *menu_path;
@@ -3301,7 +3301,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 #define N_ENTRIES 82
 	static struct {
 		const gchar *entry;
-		SensitiveCond cond;
+		SensitiveCondMask cond;
 	} entry[N_ENTRIES];
 
 	i = 0;
diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -189,7 +189,7 @@ gboolean main_window_empty_trash	(MainWindow	*mainwin,
 					 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_show			(MainWindow 	*mainwin);
 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);
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -1709,7 +1709,7 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
 
 void summary_set_menu_sensitive(SummaryView *summaryview)
 {
-	SensitiveCond state;
+	SensitiveCondMask state;
 	gboolean sensitive;
 	gint i;
 
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -2380,7 +2380,7 @@ void toolbar_update(ToolbarType type, gpointer data)
 
 void toolbar_main_set_sensitive(gpointer data)
 {
-	SensitiveCond state;
+	SensitiveCondMask state;
 	gboolean sensitive;
 	MainWindow *mainwin = (MainWindow*)data;
 	Toolbar *toolbar = mainwin->toolbar;