2005-12-22 [paul] 1.9.100cvs103

	* src/wizard.c
		don't offer IMAP as 'server type' if
		libetpan isn't built in

diff --git a/ChangeLog b/ChangeLog
index 771bb2f951a43e470d2357f8a7ccf85c33350c19..9068876026e1dfcce90f765b50e8e8307b1dc472 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-22 [paul]      1.9.100cvs103
+
+       * src/wizard.c
+               don't offer IMAP as 'server type' if
+               libetpan isn't built in
+
 2005-12-22 [paul]      1.9.100cvs102
 
        * AUTHORS

diff --git a/PATCHSETS b/PATCHSETS
index 647b14b1041abd4f226b540a6b0c39b41290b140..51bdbbd23a6b3f4b31df6fb7f1140f8384614982 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1086,3 +1086,4 @@
 ( diff -u /dev/null m4/codeset.m4;  diff -u /dev/null m4/glibc21.m4;  diff -u /dev/null m4/intdiv0.m4;  diff -u /dev/null m4/inttypes-pri.m4;  diff -u /dev/null m4/inttypes.m4;  diff -u /dev/null m4/inttypes_h.m4;  diff -u /dev/null m4/isc-posix.m4;  diff -u /dev/null m4/lcmessage.m4;  diff -u /dev/null m4/stdint_h.m4;  diff -u /dev/null m4/uintmax_t.m4;  ) > 1.9.100cvs100.patchset
 ( cvs diff -u -r 1.654.2.1130 -r 1.654.2.1131 configure.ac;  cvs diff -u -r 1.5.10.1 -r 1.5.10.2 COPYING;  cvs diff -u -r 1.382.2.209 -r 1.382.2.210 src/compose.c;  cvs diff -u -r 1.17.2.24 -r 1.17.2.25 src/send_message.c;  cvs diff -u -r 1.11.2.14 -r 1.11.2.15 src/common/smtp.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/sylpheed.def;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/sylpheed.def;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/sylpheed.def;  ) > 1.9.100cvs101.patchset
 ( cvs diff -u -r 1.100.2.30 -r 1.100.2.31 AUTHORS;  cvs diff -u -r 1.274.2.82 -r 1.274.2.83 src/mainwindow.c;  cvs diff -u -r 1.39.2.10 -r 1.39.2.11 src/mainwindow.h;  cvs diff -u -r 1.43.2.34 -r 1.43.2.35 src/toolbar.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/authors.h;  ) > 1.9.100cvs102.patchset
+( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/wizard.c;  ) > 1.9.100cvs103.patchset

diff --git a/configure.ac b/configure.ac
index c61e30984c747a852f52ead700a00e2ceb3cbc5f..59626e62cc3511a5e356bce733c906da7af6d4d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=102
+EXTRA_VERSION=103
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/wizard.c b/src/wizard.c
index ee76d7648d5c66e6e344e004879062e81b48d845..3e26f1deafadab96e55094c7ed8037a916b4431d 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -636,10 +636,12 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(wizard_protocol_changed),
                         wizard);
+#ifdef HAVE_LIBETPAN
        MENUITEM_ADD (menu, menuitem, _("IMAP"), A_IMAP4);
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(wizard_protocol_changed),
                         wizard);
+#endif
        MENUITEM_ADD (menu, menuitem, _("Local mbox file"), A_LOCAL);
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(wizard_protocol_changed),