2006-04-14 [paul] 2.1.0cvs43

	* src/crash.c
		add locale/charset info to crash report
	* src/gtk/about.c
		add wwp to doc team
		replace 'e-mail' with preferred 'email'
	* src/gtk/authors.h
		ensure contributors list is in alphabetical
		order

diff --git a/ChangeLog b/ChangeLog
index 8a526b86fd655f708d238b6f2fbaaa21ed037a7c..d74a66510be86fee17030fb3fd33541c4f2845aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-14 [paul]      2.1.0cvs43
+
+       * src/crash.c
+               add locale/charset info to crash report
+       * src/gtk/about.c
+               add wwp to doc team
+               replace 'e-mail' with preferred 'email'
+       * src/gtk/authors.h
+               ensure contributors list is in alphabetical
+               order
+

 2006-04-13 [colin]     2.1.0cvs42
 
        * src/textview.c
 2006-04-13 [colin]     2.1.0cvs42
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index 17292af8c98dd3999722ac100c483cc7f5b9c2ae..5c8ede9c49f5c162a033a59d9ba3169aa9642dee 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1414,3 +1414,4 @@
 ( cvs diff -u -r 1.23.2.27 -r 1.23.2.28 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.1.0cvs40.patchset
 ( cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/ssl_certificate.h;  cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/gtk/sslcertwindow.c;  ) > 2.1.0cvs41.patchset
 ( cvs diff -u -r 1.96.2.109 -r 1.96.2.110 src/textview.c;  ) > 2.1.0cvs42.patchset
 ( cvs diff -u -r 1.23.2.27 -r 1.23.2.28 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.1.0cvs40.patchset
 ( cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/common/ssl_certificate.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/ssl_certificate.h;  cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/gtk/sslcertwindow.c;  ) > 2.1.0cvs41.patchset
 ( cvs diff -u -r 1.96.2.109 -r 1.96.2.110 src/textview.c;  ) > 2.1.0cvs42.patchset

+( cvs diff -u -r 1.23.2.16 -r 1.23.2.17 src/crash.c;  cvs diff -u -r 1.4.2.31 -r 1.4.2.32 src/gtk/about.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/authors.h;  ) > 2.1.0cvs43.patchset

diff --git a/configure.ac b/configure.ac
index 9188457778587838c2c5817cbf3aed1b39f8957f..be81977e9a7d43de2e3098c61f71b6ed0a16031b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=42
+EXTRA_VERSION=43

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/crash.c b/src/crash.c
index b2012558b804c18b4529afe11bb5c9bfb3af3044..da6ad16c27491ecac5c9d69e6b64b8c6e5a62486 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -223,9 +223,16 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), text1);
        
        crash_report = g_strdup_printf(
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), text1);
        
        crash_report = g_strdup_printf(

-               "Sylpheed-Claws version %s\nGTK+ version %d.%d.%d\nFeatures:%s\nOperating system: %s\nC Library: %s\n--\n%s",
+               "Sylpheed-Claws version %s\n"
+               "GTK+ version %d.%d.%d / GLib %d.%d.%d\n"
+               "Locale: %s (charset: %s)\n"
+               "Features:%s\n"
+               "Operating system: %s\n"
+               "C Library: %s\n--\n%s",

                VERSION,
                gtk_major_version, gtk_minor_version, gtk_micro_version,
                VERSION,
                gtk_major_version, gtk_minor_version, gtk_micro_version,

+               glib_major_version, glib_minor_version, glib_micro_version,
+               conv_get_current_locale(), conv_get_locale_charset_str(),

                get_compiled_in_features(),
                get_operating_system(),
                get_lib_version(),
                get_compiled_in_features(),
                get_operating_system(),
                get_lib_version(),

diff --git a/src/gtk/about.c b/src/gtk/about.c
index df17ba715142a5b8d73d543f839fe6d95291b38d..5c263560306cc0e802935a942b40c4f73b70f196 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -278,7 +278,7 @@ static void about_create(void)
 
        gtk_text_buffer_insert(buffer, &iter, _(
                                "Sylpheed-Claws is a lightweight, fast and "
 
        gtk_text_buffer_insert(buffer, &iter, _(
                                "Sylpheed-Claws is a lightweight, fast and "

-                               "highly-configurable e-mail client.\n\n"
+                               "highly-configurable email client.\n\n"

                                "For further information visit the Sylpheed-"
                                "Claws website:\n"), -1);
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, HOMEPAGE_URI, -1,
                                "For further information visit the Sylpheed-"
                                "Claws website:\n"), -1);
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, HOMEPAGE_URI, -1,

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 879164036186452fb7094a785f1d052ff56e0d28..e2a962d3c078169bcf708675fd75dda6eb670f8b 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -59,6 +59,7 @@ static char *DOC_TEAM_LIST[] = {
 "Ricardo Mones Lastra <mones@users.sf.net>",
 "Colin Leroy <colinleroy@users.sf.net>",
 "Paul Mangan <twb@users.sf.net>",
 "Ricardo Mones Lastra <mones@users.sf.net>",
 "Colin Leroy <colinleroy@users.sf.net>",
 "Paul Mangan <twb@users.sf.net>",

+"wwp <wwp@users.sf.net>",

 NULL
 };
 
 NULL
 };
 


@@ -120,6 +121,7 @@ static char *CONTRIBS_LIST[] = {
 "John E.P. Hynes",
 "Hironori IWANE",
 "Motonobu Ichimura",
 "John E.P. Hynes",
 "Hironori IWANE",
 "Motonobu Ichimura",

+"Alexey Illarionov",

 "Yoichi Imai",
 "Mathias Intemann",
 "Ishihara",
 "Yoichi Imai",
 "Mathias Intemann",
 "Ishihara",


@@ -225,6 +227,5 @@ static char *CONTRIBS_LIST[] = {
 "Gál Zoltán",
 "Marien Zwart",
 "Martin Zwickel",
 "Gál Zoltán",
 "Marien Zwart",
 "Martin Zwickel",

-"Alexey Illarionov",

 NULL
 };
 NULL
 };