From: Paul Mangan Date: Thu, 18 Oct 2007 09:29:06 +0000 (+0000) Subject: 2007-10-18 [paul] 3.0.2cvs85 X-Git-Tag: rel_3_1_0~65 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=0d31f6c3218abb46e62e38f6cac4c2ce42d8d2aa 2007-10-18 [paul] 3.0.2cvs85 * configure.ac add info about NNTP support via libetpan change the configure output ending msg a little * src/gtk/about.c similar changes to above --- diff --git a/ChangeLog b/ChangeLog index a381065eb..cc764f8b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-10-18 [paul] 3.0.2cvs85 + + * configure.ac + add info about NNTP support via libetpan + change the configure output ending msg a little + * src/gtk/about.c + similar changes to above + 2007-10-18 [colin] 3.0.2cvs84 * src/procmime.c diff --git a/PATCHSETS b/PATCHSETS index 31aa776da..58719f049 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2997,3 +2997,4 @@ ( cvs diff -u -r 1.61.2.74 -r 1.61.2.75 src/account.c; cvs diff -u -r 1.23.2.26 -r 1.23.2.27 src/crash.c; cvs diff -u -r 1.179.2.194 -r 1.179.2.195 src/imap.c; cvs diff -u -r 1.149.2.83 -r 1.149.2.84 src/inc.c; cvs diff -u -r 1.115.2.173 -r 1.115.2.174 src/main.c; cvs diff -u -r 1.274.2.217 -r 1.274.2.218 src/mainwindow.c; cvs diff -u -r 1.101.2.41 -r 1.101.2.42 src/news.c; cvs diff -u -r 1.21.2.7 -r 1.21.2.8 src/news.h; cvs diff -u -r 1.56.2.59 -r 1.56.2.60 src/pop.c; cvs diff -u -r 1.17.2.20 -r 1.17.2.21 src/pop.h; cvs diff -u -r 1.105.2.112 -r 1.105.2.113 src/prefs_account.c; cvs diff -u -r 1.17.2.13 -r 1.17.2.14 src/recv.c; cvs diff -u -r 1.6.12.7 -r 1.6.12.8 src/recv.h; cvs diff -u -r 1.17.2.44 -r 1.17.2.45 src/send_message.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/send_message.h; cvs diff -u -r 1.3.2.29 -r 1.3.2.30 src/ssl_manager.c; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/ssl_manager.h; cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/wizard.c; cvs diff -u -r 1.24.2.15 -r 1.24.2.16 src/common/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/common/claws.c; cvs diff -u -r -1.6.2.15 -r -1.6.2.16 src/common/nntp.c; cvs diff -u -r -1.4.2.6 -r -1.4.2.7 src/common/nntp.h; cvs diff -u -r 1.23.2.15 -r 1.23.2.16 src/common/session.c; cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/common/session.h; cvs diff -u -r 1.11.2.22 -r 1.11.2.23 src/common/smtp.c; cvs diff -u -r 1.6.2.12 -r 1.6.2.13 src/common/smtp.h; cvs diff -u -r 1.13.2.36 -r 1.13.2.37 src/common/socket.c; cvs diff -u -r 1.13.2.16 -r 1.13.2.17 src/common/socket.h; cvs diff -u -r 1.9.2.21 -r 1.9.2.22 src/common/ssl.c; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 src/common/ssl.h; cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/common/ssl_certificate.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/etpan/Makefile.am; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/etpan-thread-manager-types.h; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/etpan/etpan-thread-manager.c; cvs diff -u -r 1.1.4.87 -r 1.1.4.88 src/etpan/imap-thread.c; diff -u /dev/null src/etpan/nntp-thread.c; diff -u /dev/null src/etpan/nntp-thread.h; cvs diff -u -r 1.4.2.53 -r 1.4.2.54 src/gtk/about.c; cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.8 -r 1.6.2.9 src/gtk/sslcertwindow.h; ) > 3.0.2cvs82.patchset ( cvs diff -u -r 1.1.4.43 -r 1.1.4.44 src/prefs_filtering_action.c; ) > 3.0.2cvs83.patchset ( cvs diff -u -r 1.49.2.101 -r 1.49.2.102 src/procmime.c; cvs diff -u -r 1.17.2.21 -r 1.17.2.22 src/procmime.h; ) > 3.0.2cvs84.patchset +( cvs diff -u -r 1.654.2.3054 -r 1.654.2.3055 configure.ac; cvs diff -u -r 1.4.2.54 -r 1.4.2.55 src/gtk/about.c; ) > 3.0.2cvs85.patchset diff --git a/configure.ac b/configure.ac index 4dc9fc0a4..93639d2c2 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=84 +EXTRA_VERSION=85 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -840,7 +840,7 @@ AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes) dnl Libetpan AC_MSG_CHECKING([whether to use libetpan]) AC_ARG_ENABLE(libetpan, - [ --disable-libetpan disable IMAP4 (libetpan) support], + [ --disable-libetpan disable IMAP4/NNTP (libetpan) support], [ac_cv_enable_libetpan=$enableval], [ac_cv_enable_libetpan=yes]) if test x"$ac_cv_enable_libetpan" = xyes; then AC_MSG_RESULT(yes) @@ -862,15 +862,15 @@ if test x"$ac_cv_enable_libetpan" = xyes; then LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"` if test "$LIBETPAN_VERSION" -lt "049"; then AC_MSG_RESULT([*** Claws Mail requires libetpan 0.49 or newer. See http://www.etpan.org/]) - AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.]) + AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) AC_MSG_ERROR([libetpan 0.49 not found]) fi AC_SUBST(LIBETPAN_FLAGS) AC_SUBST(LIBETPAN_LIBS) - AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.) + AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.) else AC_MSG_RESULT([*** Claws Mail requires libetpan 0.49 or newer. See http://www.etpan.org/ ]) - AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.]) + AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) AC_MSG_ERROR([libetpan 0.49 not found]) fi else @@ -983,22 +983,24 @@ dnl Output the configuration summary echo "" echo "$PACKAGE $VERSION" echo "" -echo "JPilot : $ac_cv_enable_jpilot" -echo "LDAP : $ac_cv_enable_ldap" -echo "OpenSSL : $ac_cv_enable_openssl" -echo "gnuTLS : $ac_cv_enable_gnutls" -echo "iconv : $am_cv_func_iconv" -echo "compface : $ac_cv_enable_compface" -echo "IPv6 : $ac_cv_enable_ipv6" -echo "GNU/aspell : $ac_cv_enable_aspell" -echo "IMAP4 : $ac_cv_enable_libetpan" -echo "Crash dialog : $ac_cv_enable_crash_dialog" -echo "Libgnomeprint : $ac_cv_enable_gnomeprint (GTK+ 2.10: $ac_cv_have_gtk210)" -echo "LibSM : $ac_cv_enable_libsm" -echo "Manual : $ac_cv_enable_manual" -echo "Plugins : $PLUGINS" -echo "Maemo build : $ac_cv_enable_maemo" -echo "Config dir : $ac_cv_with_config_dir" +echo "JPilot : $ac_cv_enable_jpilot" +echo "LDAP : $ac_cv_enable_ldap" +echo "OpenSSL : $ac_cv_enable_openssl" +echo "gnuTLS : $ac_cv_enable_gnutls" +echo "iconv : $am_cv_func_iconv" +echo "compface : $ac_cv_enable_compface" +echo "IPv6 : $ac_cv_enable_ipv6" +echo "GNU/aspell : $ac_cv_enable_aspell" +echo "IMAP4 : $ac_cv_enable_libetpan" +echo "NNTP : $ac_cv_enable_libetpan" +echo "Crash dialog : $ac_cv_enable_crash_dialog" +echo "Libgnomeprint : $ac_cv_enable_gnomeprint" +echo "GTK+ print support: $ac_cv_have_gtk210" +echo "LibSM : $ac_cv_enable_libsm" +echo "Manual : $ac_cv_enable_manual" +echo "Plugins : $PLUGINS" +echo "Maemo build : $ac_cv_enable_maemo" +echo "Config dir : $ac_cv_with_config_dir" echo "" echo "The binary will be installed in $prefix/bin" echo "" diff --git a/src/gtk/about.c b/src/gtk/about.c index 5f2597f0e..09e79c591 100644 --- a/src/gtk/about.c +++ b/src/gtk/about.c @@ -412,66 +412,66 @@ static GtkWidget *about_create_child_page_features(void) stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_ON, &active_pixbuf); stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_OFF, &inactive_pixbuf); -#if INET6 +#if HAVE_LIBCOMPFACE gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); #else gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf); #endif - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" IPv6 "), -1, + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" compface "), -1, "bold", NULL); gtk_text_buffer_insert(buffer, &iter, - (gchar *)Q_("IPv6|adds support for IPv6 addresses, the new internet " - "addressing protocol\n"), -1); + (gchar *)Q_("compface|adds support for the X-Face header\n"), -1); -#if HAVE_ICONV +#if USE_ASPELL gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); #else gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf); #endif - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" iconv "), -1, + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GNU/aspell "), -1, "bold", NULL); gtk_text_buffer_insert(buffer, &iter, - (gchar *)Q_("iconv|allows converting to and from different character sets\n"), -1); + (gchar *)Q_("GNU/aspell|adds support for spell checking\n"), -1); -#if HAVE_LIBCOMPFACE +#if USE_GNUTLS gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); #else gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf); #endif - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" compface "), -1, + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GnuTLS "), -1, "bold", NULL); gtk_text_buffer_insert(buffer, &iter, - (gchar *)Q_("compface|adds support for the X-Face header\n"), -1); + (gchar *)Q_("GnuTLS|adds support for encrypted connections to servers\n"), -1); -#if USE_OPENSSL +#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT) gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); #else gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf); #endif - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" OpenSSL "), -1, + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GTK+ >= 2.10.0 "), -1, "bold", NULL); gtk_text_buffer_insert(buffer, &iter, - (gchar *)Q_("OpenSSL|adds support for encrypted connections to servers\n"), -1); + (gchar *)Q_("GTK+ >= 2.10.0|adds support for a complete print dialog\n"), -1); -#if USE_GNUTLS +#if INET6 gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); #else gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf); #endif - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GnuTLS "), -1, + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" IPv6 "), -1, "bold", NULL); gtk_text_buffer_insert(buffer, &iter, - (gchar *)Q_("GnuTLS|is another mean of adding support for encrypted connections to servers\n"), -1); + (gchar *)Q_("IPv6|adds support for IPv6 addresses, the new internet " + "addressing protocol\n"), -1); -#if USE_LDAP +#if HAVE_ICONV gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); #else gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf); #endif - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" LDAP "), -1, + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" iconv "), -1, "bold", NULL); gtk_text_buffer_insert(buffer, &iter, - (gchar *)Q_("LDAP|adds support for LDAP shared addressbooks\n"), -1); + (gchar *)Q_("iconv|allows converting to and from different character sets\n"), -1); #if USE_JPILOT gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); @@ -483,15 +483,15 @@ static GtkWidget *about_create_child_page_features(void) gtk_text_buffer_insert(buffer, &iter, (gchar *)Q_("JPilot|adds support for PalmOS addressbooks\n"), -1); -#if USE_ASPELL +#if USE_LDAP gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); #else gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf); #endif - gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GNU/aspell "), -1, + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" LDAP "), -1, "bold", NULL); gtk_text_buffer_insert(buffer, &iter, - (gchar *)Q_("GNU/aspell|adds support for spell checking\n"), -1); + (gchar *)Q_("LDAP|adds support for LDAP shared addressbooks\n"), -1); #if HAVE_LIBETPAN gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); @@ -501,7 +501,7 @@ static GtkWidget *about_create_child_page_features(void) gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" libetpan "), -1, "bold", NULL); gtk_text_buffer_insert(buffer, &iter, - (gchar *)Q_("libetpan|adds support for IMAP servers\n"), -1); + (gchar *)Q_("libetpan|adds support for IMAP and NNTP servers\n"), -1); #if USE_GNOMEPRINT gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); @@ -523,6 +523,16 @@ static GtkWidget *about_create_child_page_features(void) gtk_text_buffer_insert(buffer, &iter, (gchar *)Q_("libSM|adds support for session handling\n"), -1); +#if USE_OPENSSL + gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf); +#else + gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf); +#endif + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" OpenSSL "), -1, + "bold", NULL); + gtk_text_buffer_insert(buffer, &iter, + (gchar *)Q_("OpenSSL|adds support for encrypted connections to servers\n"), -1); + return scrolledwin; }