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>.

diff --git a/ChangeLog b/ChangeLog
index 1da32330aefc89aac2ceae9b8e6940cb67930edb..a36004a2215e60d87fe3f8c082ff6cdd617c638e 100644 (file)
--- 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
 2012-08-16 [colin]     3.8.1cvs33
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index d590828d124baa34d29f94c99d69cf457de1f21a..2b47ca696e5ff83696e2db436d71f489b226ac06 100644 (file)
--- 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.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 7e980b7d6165632bb9a9743e36f5cb8c359879a1..078ec39b77928f7e62417801c42d51bfda6d0759 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=33
+EXTRA_VERSION=34

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index e3dfbd9ac8fc46e708f92c5f656ceb2c1b5d8e54..ce168b661b2d899c238d0c3246fc6a07f06042de 100644 (file)
--- 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)
 {
 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;
        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)
 }
 
 static void toggle_work_offline_cb (GtkAction *action, gpointer data)