2005-07-15 [colin] 1.9.12cvs63

	* src/main.c
		Fix build with --disable-libetpan

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index c3f1e9596b9568a623bf141e748296bc06751650..d4d4aa7c17277168debfe7a9acd3290473cc3982 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-07-15 [colin]     1.9.12cvs63
+
+       * src/main.c
+               Fix build with --disable-libetpan
+
 2005-07-15 [colin]     1.9.12cvs62
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index a3c56a43fc9fa0aac83ae02193ce0c8ea32f948f..5125c310829f9c3932ea76af30a85307339e4b72 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -657,3 +657,4 @@
 ( cvs diff -u -r 1.60.2.18 -r 1.60.2.19 src/addressbook.c;  ) > 1.9.12cvs60.patchset
 ( cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/etpan/imap-thread.c;  ) > 1.9.12cvs61.patchset
 ( cvs diff -u -r 1.654.2.696 -r 1.654.2.697 configure.ac;  ) > 1.9.12cvs62.patchset
+( cvs diff -u -r 1.115.2.42 -r 1.115.2.43 src/main.c;  ) > 1.9.12cvs63.patchset

diff --git a/configure.ac b/configure.ac
index 0709a89b266844b9ceaf392a69c761b7c7151abe..06ec7019a149f7210474dbe9fa8a29d4a9335e77 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=62
+EXTRA_VERSION=63
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 9d5857fd235ac31c50e6fea4612ff3eda7174edf..a4d531c1cead05254a0e747eabf25386cc61e81f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -89,7 +89,9 @@
 #include "imap_gtk.h"
 #include "news_gtk.h"
 #include "matcher.h"
+#ifdef USE_LIBETPAN
 #include "imap-thread.h"
+#endif
 #include "stock_pixmap.h"
 
 #if USE_OPENSSL
@@ -337,8 +339,9 @@ int main(int argc, char *argv[])
 #endif
        
        sock_set_io_timeout(prefs_common.io_timeout_secs);
+#ifdef USE_LIBETPAN
        imap_main_set_timeout(prefs_common.io_timeout_secs);
-       
+#endif
        prefs_actions_read_config();
        prefs_display_header_read_config();
        /* prefs_filtering_read_config(); */
@@ -381,8 +384,9 @@ int main(int argc, char *argv[])
                        exit_sylpheed(mainwin);
        }
 
+#ifdef USE_LIBETPAN
        imap_main_init();
-       
+#endif 
        account_set_missing_folder();
        folder_set_missing_folders();
        folderview_set(folderview);
@@ -475,9 +479,9 @@ static void exit_sylpheed(MainWindow *mainwin)
        gchar *filename;
 
        debug_print("shutting down\n");
-
+#ifdef USE_LIBETPAN
        imap_main_done();
-       
+#endif
        inc_autocheck_timer_remove();
 
        if (prefs_common.clean_on_exit)