talons

commit 0d10f5edd6b114c325746bb6628f00589858fc77
parent af33e4fafbd2c2037900f2effd45fe4e6787f586
Author: Colin Leroy <colin@colino.net>
Date:   Thu, 23 Aug 2012 11:09:39 +0000

2012-08-23 [colin]	3.8.1cvs34

	* src/mainwindow.c
		Fix --offline asking if one wants to sync,
		due to re-entering. Thanks <ebik@ucw.cz>.

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
9
+++++++++

4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-23 [colin]	3.8.1cvs34
+
+	* src/mainwindow.c
+		Fix --offline asking if one wants to sync,
+		due to re-entering. Thanks <ebik@ucw.cz>.
+
 2012-08-16 [colin]	3.8.1cvs33
 
 	* src/imap.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4408,3 +4408,4 @@
 ( cvs diff -u -r 1.94.2.236 -r 1.94.2.237 src/messageview.c;  ) > 3.8.1cvs31.patchset
 ( cvs diff -u -r 1.382.2.608 -r 1.382.2.609 src/compose.c;  ) > 3.8.1cvs32.patchset
 ( cvs diff -u -r 1.179.2.258 -r 1.179.2.259 src/imap.c;  ) > 3.8.1cvs33.patchset
+( cvs diff -u -r 1.274.2.346 -r 1.274.2.347 src/mainwindow.c;  ) > 3.8.1cvs34.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -4226,12 +4226,21 @@ static void set_layout_cb(GtkAction *action, GtkRadioAction *current, gpointer d
 void main_window_toggle_work_offline (MainWindow *mainwin, gboolean offline,
 					gboolean ask_sync)
 {
+	static gboolean switching = FALSE;
+
+	if (switching)
+		return;
+
+	switching = TRUE;
+
 	offline_ask_sync = ask_sync;
 	if (offline)
 		online_switch_clicked (GTK_BUTTON(mainwin->online_switch), mainwin);
 	else
 		online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);
 	offline_ask_sync = TRUE;
+
+	switching = FALSE;
 }
 
 static void toggle_work_offline_cb (GtkAction *action, gpointer data)