From: Colin Leroy <colin@colino.net>
Date: Fri, 15 Jul 2005 18:19:29 +0000 (+0000)
Subject: 2005-07-15 [colin]	1.9.12cvs63
X-Git-Tag: rel_1_9_13~30
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=660e531c34af2a5d34964bad2bda5d7126c7d530

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 c3f1e9596..d4d4aa7c1 100644
--- 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 a3c56a43f..5125c3108 100644
--- 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 0709a89b2..06ec7019a 100644
--- 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 9d5857fd2..a4d531c1c 100644
--- 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)