2005-10-03 [paul] 1.9.14cvs66

	* src/main.c
		fix crash in IMAP caused by discrepancy
		between check_at_startup and offline mode
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 3e7e086a7899e444f069c1c62a5e292e59357fd1..b10359fb9c0e784e35c106c8cc6af902904c4230 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-10-03 [paul]      1.9.14cvs66
+
+       * src/main.c
+               fix crash in IMAP caused by discrepancy
+               between check_at_startup and offline mode
+               Patch by Colin
+
 2005-10-01 [paul]      1.9.14cvs65
 
        * src/inc.c

diff --git a/PATCHSETS b/PATCHSETS
index d57ee08d9b483227a213a20277e74cbe586629a4..224ee550fd33e2e95809e40b4a727188803d1688 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -834,3 +834,4 @@
 ( cvs diff -u -r 1.60.2.32 -r 1.60.2.33 src/addressbook.c;  cvs diff -u -r 1.65.2.40 -r 1.65.2.41 src/codeconv.c;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/common/xml.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.14cvs63.patchset
 ( cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/export.c;  cvs diff -u -r 1.13.2.9 -r 1.13.2.10 src/import.c;  cvs diff -u -r 1.28.2.9 -r 1.28.2.10 src/mbox.c;  ) > 1.9.14cvs64.patchset
 ( cvs diff -u -r 1.149.2.34 -r 1.149.2.35 src/inc.c;  ) > 1.9.14cvs65.patchset
+( cvs diff -u -r 1.115.2.55 -r 1.115.2.56 src/main.c;  ) > 1.9.14cvs66.patchset

diff --git a/configure.ac b/configure.ac
index b721212cc4a325c1f0585524d3d554a47d69919e..b0f98611b2485ee7f0b5940e11be21cefb4822b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=65
+EXTRA_VERSION=66
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 8b79193e8efda4d8d19dd4e10443f2957c75d891..a9457f2e6101a1e5fd53db0b9e071e66d95a45e8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -229,6 +229,23 @@ void sylpheed_gtk_idle(void)
        usleep(50000);
 }
 
+gboolean defer_check_all(void *data)
+{
+       gboolean autochk = GPOINTER_TO_INT(data);
+
+       inc_all_account_mail(static_mainwindow, autochk, 
+                       prefs_common.newmail_notify_manu);
+
+       return FALSE;
+}
+
+gboolean defer_check(void *data)
+{
+       inc_mail(static_mainwindow, prefs_common.newmail_notify_manu);
+
+       return FALSE;
+}
+
 int main(int argc, char *argv[])
 {
        gchar *userrc;
@@ -464,13 +481,11 @@ int main(int argc, char *argv[])
 #endif
 
        if (cmd.receive_all)
-               inc_all_account_mail(mainwin, FALSE, 
-                                    prefs_common.newmail_notify_manu);
+               g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
        else if (prefs_common.chk_on_startup)
-               inc_all_account_mail(mainwin, TRUE, 
-                                    prefs_common.newmail_notify_manu);
+               g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
        else if (cmd.receive)
-               inc_mail(mainwin, prefs_common.newmail_notify_manu);
+               g_timeout_add(1000, defer_check, NULL);
        else
                gtk_widget_grab_focus(folderview->ctree);