2012-11-27 [colin] 3.9.0cvs25

	* src/main.c
		Unbreak the build.

diff --git a/ChangeLog b/ChangeLog
index 6686a9e6564cf30b7b80c256a1631f935826b258..63e7b91df0c1d7ff0385d3742b4d080aa4a1dffd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-27 [colin]     3.9.0cvs25
+
+       * src/main.c
+               Unbreak the build.
+
 2012-11-27 [colin]     3.9.0cvs24
 
        * src/common/ssl.c

diff --git a/PATCHSETS b/PATCHSETS
index a876550400cd7f5467a9619493bfe07c46311ef9..5f6669c8c4cceab1e22298034df60fa82767de17 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4522,3 +4522,4 @@
 ( cvs diff -u -r 1.274.2.356 -r 1.274.2.357 src/mainwindow.c;  cvs diff -u -r 1.204.2.213 -r 1.204.2.214 src/prefs_common.c;  cvs diff -u -r 1.103.2.142 -r 1.103.2.143 src/prefs_common.h;  ) > 3.9.0cvs22.patchset
 ( cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/manage_window.c;  ) > 3.9.0cvs23.patchset
 ( cvs diff -u -r 1.9.2.58 -r 1.9.2.59 src/common/ssl.c;  ) > 3.9.0cvs24.patchset
+( cvs diff -u -r 1.115.2.264 -r 1.115.2.265 src/main.c;  ) > 3.9.0cvs25.patchset

diff --git a/configure.ac b/configure.ac
index 0f0357768e9cd64d0ba2fa4250362cd2511cc1f0..c26a07132cf8a148d1c58d7e0729a552a32905cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 27ff8217c1bdc22cde3fb740fc14b06be4053d6f..074def12ddf3faae7f078f59268a5269b0c45a15 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -386,11 +386,6 @@ static gboolean defer_check_all(void *data)
        inc_all_account_mail(static_mainwindow, autochk, 
                        prefs_common.newmail_notify_manu);
 
-       /* Accounts using a specific timer need to be checked separately
-        * at startup
-        */
-       inc_all_account_spec_timer_check_mail();
-       
        if (sc_starting) {
                sc_starting = FALSE;
                main_window_set_menu_sensitive(static_mainwindow);