From: Colin Leroy Date: Thu, 23 Aug 2012 11:09:39 +0000 (+0000) Subject: 2012-08-23 [colin] 3.8.1cvs34 X-Git-Tag: REL_3_9_0~90 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0d10f5edd6b114c325746bb6628f00589858fc77 2012-08-23 [colin] 3.8.1cvs34 * src/mainwindow.c Fix --offline asking if one wants to sync, due to re-entering. Thanks . --- diff --git a/ChangeLog b/ChangeLog index 1da32330a..a36004a22 100644 --- 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 . + 2012-08-16 [colin] 3.8.1cvs33 * src/imap.c diff --git a/PATCHSETS b/PATCHSETS index d590828d1..2b47ca696 100644 --- 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 index 7e980b7d6..078ec39b7 100644 --- 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 index e3dfbd9ac..ce168b661 100644 --- 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)