2006-04-11 [colin] 2.1.0cvs28

* src/gtk/about.c
		Add locale and charset in the label
This commit is contained in:
Colin Leroy 2006-04-11 06:35:11 +00:00
parent ac661dc623
commit f8cbb1add6
4 changed files with 17 additions and 5 deletions

View file

@ -1,3 +1,8 @@
2006-04-11 [colin] 2.1.0cvs28
* src/gtk/about.c
Add locale and charset in the label
2006-04-10 [colin] 2.1.0cvs27
* src/compose.c

View file

@ -1399,3 +1399,4 @@
( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/plugins.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/plugins.xml; ) > 2.1.0cvs25.patchset
( cvs diff -u -r 1.115.2.78 -r 1.115.2.79 src/main.c; cvs diff -u -r 1.274.2.106 -r 1.274.2.107 src/mainwindow.c; cvs diff -u -r 1.39.2.15 -r 1.39.2.16 src/mainwindow.h; ) > 2.1.0cvs26.patchset
( cvs diff -u -r 1.382.2.260 -r 1.382.2.261 src/compose.c; cvs diff -u -r 1.204.2.82 -r 1.204.2.83 src/prefs_common.c; cvs diff -u -r 1.103.2.46 -r 1.103.2.47 src/prefs_common.h; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_msg_colors.c; cvs diff -u -r 1.96.2.108 -r 1.96.2.109 src/textview.c; ) > 2.1.0cvs27.patchset
( cvs diff -u -r 1.4.2.30 -r 1.4.2.31 src/gtk/about.c; ) > 2.1.0cvs28.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=1
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=27
EXTRA_VERSION=28
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -159,23 +159,29 @@ static void about_create(void)
uname(&utsbuf);
g_snprintf(buf, sizeof(buf),
_("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
"Operating System: %s %s (%s)"),
"Locale: %s (charset: %s)\n"
"Operating System: %s %s (%s)"),
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(),
utsbuf.sysname, utsbuf.release, utsbuf.machine);
#elif defined(G_OS_WIN32)
g_snprintf(buf, sizeof(buf),
_("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
"Operating System: %s"),
"Locale: %s (charset: %s)\n"
"Operating System: %s"),
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(),
"Win32");
#else
g_snprintf(buf, sizeof(buf),
_("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
"Operating System: unknown"),
"Locale: %s (charset: %s)\n"
"Operating System: unknown"),
gtk_major_version, gtk_minor_version, gtk_micro_version,
glib_major_version, glib_minor_version, glib_micro_version);
glib_major_version, glib_minor_version, glib_micro_version,
conv_get_current_locale(), conv_get_locale_charset_str());
#endif
label = gtk_label_new(buf);