2007-11-16 [colin] 3.0.2cvs140

	* src/main.c
	* src/common/claws.c
		Output a bit more useful info at startup
		in --debug mode

diff --git a/ChangeLog b/ChangeLog
index 68c6c1019a3741eacd01beece42e3f3d27587bbf..6c60a71e2c2f5a3d5b1955f9164937a4b787d9b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-16 [colin]     3.0.2cvs140
+
+       * src/main.c
+       * src/common/claws.c
+               Output a bit more useful info at startup
+               in --debug mode
+
 2007-11-16 [colin]     3.0.2cvs139
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index c4eceeb2210d969d51ae11a4ba64ce689a997477..0b706c8a40157dbe4a29462aebb6f780222e2afe 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3052,3 +3052,4 @@
 ( cvs diff -u -r 1.16.2.32 -r 1.16.2.33 src/prefs_display_header.c;  ) > 3.0.2cvs137.patchset
 ( cvs diff -u -r 1.101.2.45 -r 1.101.2.46 src/news.c;  ) > 3.0.2cvs138.patchset
 ( cvs diff -u -r 1.382.2.420 -r 1.382.2.421 src/compose.c;  cvs diff -u -r 1.36.2.123 -r 1.36.2.124 src/common/utils.c;  cvs diff -u -r 1.20.2.54 -r 1.20.2.55 src/common/utils.h;  ) > 3.0.2cvs139.patchset
+( cvs diff -u -r 1.115.2.175 -r 1.115.2.176 src/main.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/claws.c;  ) > 3.0.2cvs140.patchset

diff --git a/configure.ac b/configure.ac
index 1be509add2c2ebbd27866f462794ac6f9fdb6f5d..db22c1511da1c560e00b661bdb135b12dec19c55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=139
+EXTRA_VERSION=140
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/claws.c b/src/common/claws.c
index 38fd532e90e491afebf8b7d0c2580876661b192a..281e65a0169be3c6fde449735fdf9da8d8be849f 100644 (file)
--- a/src/common/claws.c
+++ b/src/common/claws.c
@@ -95,8 +95,8 @@ gboolean claws_init(int *argc, char ***argv)
 
        parse_parameter(argc, argv);
 
-       debug_print("Starting Claws Mail version %08x\n", VERSION_NUMERIC);
-
+       debug_print("Starting Claws Mail version %s\n", PROG_VERSION);
+       
        setlocale(LC_ALL, "");
 #ifdef ENABLE_NLS
        bindtextdomain(PACKAGE, get_locale_dir () );

diff --git a/src/main.c b/src/main.c
index 86bd124d449e43b55846acd495742da89dc183b6..763344bc5e45c2334c3d355cf71ab440c38b9f3d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -815,6 +815,44 @@ int main(int argc, char *argv[])
                return 0;
        }
 
+       debug_print("GTK+ %d.%d.%d / GLib %d.%d.%d\n",
+                  gtk_major_version, gtk_minor_version, gtk_micro_version,
+                  glib_major_version, glib_minor_version, glib_micro_version);
+       debug_print("Compiled-in features:\n");
+#if HAVE_LIBCOMPFACE
+       debug_print(" compface\n");
+#endif
+#if USE_ASPELL
+       debug_print(" aspell\n");
+#endif
+#if USE_GNUTLS
+       debug_print(" gnutls\n");
+#endif
+#if INET6
+       debug_print(" ipv6\n");
+#endif
+#if HAVE_ICONV
+       debug_print(" iconv\n");
+#endif
+#if USE_JPILOT
+       debug_print(" jpilot\n");
+#endif
+#if USE_LDAP
+       debug_print(" ldap\n");
+#endif
+#if HAVE_LIBETPAN
+       debug_print(" libetpan %d.%d\n", LIBETPAN_VERSION_MAJOR, LIBETPAN_VERSION_MINOR);
+#endif
+#if USE_GNOMEPRINT
+       debug_print(" gnomeprint\n");
+#endif
+#if HAVE_LIBSM
+       debug_print(" libsm\n");
+#endif
+#if USE_OPENSSL
+       debug_print(" openssl\n");
+#endif
+
        prog_version = PROG_VERSION;
        argv0 = g_strdup(argv[0]);