2007-04-11 [colin] 2.8.1cvs93

	* src/main.c
		don't scan for new mail on startup if --select
		is specified (or race conditions arise). If so,
		do both sequentially.

diff --git a/ChangeLog b/ChangeLog
index 811a3a2d0b67fca3a8cc47ce9c2f8b75b0632910..feb7289c1a31b182504ffda57997ec8ce0e4786a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-11 [colin]     2.8.1cvs93
+
+       * src/main.c
+               don't scan for new mail on startup if --select
+               is specified (or race conditions arise). If so,
+               do both sequentially.
+
 2007-04-09 [colin]     2.8.1cvs92
 
        * src/common/defs.h

diff --git a/PATCHSETS b/PATCHSETS
index 372f4e4d33d84a3ee0c66e94fa52e206278e579f..ecb6da3774dadd509259490a4a713d872d745b02 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2509,3 +2509,4 @@
 ( cvs diff -u -r 1.274.2.183 -r 1.274.2.184 src/mainwindow.c;  ) > 2.8.1cvs90.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_close.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_close_hrm.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_close_hrm_mark.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_close_mark.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_open.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_open_hrm.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_open_hrm_mark.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_open_mark.xpm;  ) > 2.8.1cvs91.patchset
 ( cvs diff -u -r 1.9.2.35 -r 1.9.2.36 src/common/defs.h;  ) > 2.8.1cvs92.patchset
+( cvs diff -u -r 1.115.2.151 -r 1.115.2.152 src/main.c;  ) > 2.8.1cvs93.patchset

diff --git a/configure.ac b/configure.ac
index 040a55ab89f2fcffcf26679504b8eb642a06a11e..d328370a51e87e1a2f242186013f28d11d204d0b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=92
+EXTRA_VERSION=93
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 16ae54d2a2b0f7baf512796568acd416fd8c90f6..e856fe4850455f237be05f2cb30cfe472c13502e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -307,6 +307,13 @@ static gboolean defer_check(void *data)
 
 static gboolean defer_jump(void *data)
 {
+       if (cmd.receive_all) {
+               defer_check_all(GINT_TO_POINTER(FALSE));
+       } else if (prefs_common.chk_on_startup) {
+               defer_check_all(GINT_TO_POINTER(TRUE));
+       } else if (cmd.receive) {
+               defer_check(NULL);
+       } 
        mainwindow_jump_to(data);
        return FALSE;
 }
@@ -1032,11 +1039,11 @@ int main(int argc, char *argv[])
        gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
        main_window_cursor_normal(mainwin);
 
-       if (cmd.receive_all) {
+       if (cmd.receive_all && !cmd.target) {
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(FALSE));
-       } else if (prefs_common.chk_on_startup) {
+       } else if (prefs_common.chk_on_startup && !cmd.target) {
                g_timeout_add(1000, defer_check_all, GINT_TO_POINTER(TRUE));
-       } else if (cmd.receive) {
+       } else if (cmd.receive && !cmd.target) {
                g_timeout_add(1000, defer_check, NULL);
        } else {
                gtk_widget_grab_focus(folderview->ctree);