summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--THANKS2
-rw-r--r--src/about.c2
-rw-r--r--src/main.c16
4 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ceeeb169..34dba2ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+2003-09-04 Glynn Foster <glynn.foster@sun.com>
+
+ * THANKS: Update.
+ * src/about.c: Update.
+ * src/main.c: Patch from Toshi to fix encoding of passed
+ text strings. Fixes #121389.
+
2003-09-01 Glynn Foster <glynn.foster@sun.com>
- * src/gdialog.in: Add patch from Buchan Miln to fix the gdialog
+ * src/gdialog.in: Add patch from Buchan Milne to fix the gdialog
wrapper.
2003-09-01 Glynn Foster <glynn.foster@sun.com>
diff --git a/THANKS b/THANKS
index 2ccee8a4..3ccd9117 100644
--- a/THANKS
+++ b/THANKS
@@ -6,10 +6,12 @@ Nicholas Curran <quasar@austar.net.au>
John Fleck <jfleck@inkstain.net>
James Henstridge <james@daa.com.au>
Mihai T. Lazarescu <mihai@email.it>
+Buhan Milne <bhmilne@linux-mandrake.com>
Mike Newman <mike@gtnorthern.demon.co.uk>
Havoc Pennington <hp@redhat.com>
Kevin C. Krinke <kckrinke@opendoorsoftware.com>
Kristian Rietveld <kris@gtk.org>
Jakub Steiner <jimmac@ximian.com>
Danel d'Surreal <dagmar@speakeasy.net>
+Hidetoshi Tajima <hidetoshi.tajima@sun.com>
Tom Tromey <tromey@redhat.com>
diff --git a/src/about.c b/src/about.c
index b59e5f1c..a42a6e17 100644
--- a/src/about.c
+++ b/src/about.c
@@ -57,12 +57,14 @@ static const gchar *author_credits[] = {
"John Fleck <jfleck@inkstain.net>",
"James Henstridge <james@daa.com.au>",
"Mihai T. Lazarescu <mihai@email.it>",
+ "Buhan Milne <bgmilne@linux-mandrake.com>",
"Mike Newman <mikegtn@gnome.org>",
"Havoc Pennington <hp@redhat.com>",
"Kevin C. Krinke <kckrinke@opendoorsoftware.com>",
"Kristian Rietveld <kris@gtk.org>",
"Jakub Steiner <jimmac@ximian.com>",
"Daniel d'Surreal <dagmar@speakeasy.net>",
+ "Hidetoshi Tajima <hidetoshi.tajima@sun.com>",
"Tom Tromey <tromey@redhat.com>",
NULL
};
diff --git a/src/main.c b/src/main.c
index 02bc8188..95eee262 100644
--- a/src/main.c
+++ b/src/main.c
@@ -939,7 +939,9 @@ zenity_init_parsing_options (void) {
/* Give some sensible defaults */
results->data->width = -1;
results->data->height = -1;
- results->calendar_data->date_format = g_strdup (nl_langinfo (D_FMT));
+ results->calendar_data->date_format = g_locale_to_utf8 (nl_langinfo (D_FMT),
+ -1,
+ NULL, NULL, NULL);
results->calendar_data->day = 0;
results->calendar_data->month = 0;
results->calendar_data->year = 0;
@@ -1239,19 +1241,23 @@ zenity_parse_options_callback (poptContext ctx,
switch (results->mode) {
case MODE_CALENDAR:
- results->calendar_data->dialog_text = g_strdup (g_strcompress (arg));
+ results->calendar_data->dialog_text = g_locale_to_utf8 (g_strcompress (arg),
+ -1, NULL, NULL, NULL);
break;
case MODE_ENTRY:
- results->entry_data->dialog_text = g_strdup (g_strcompress (arg));
+ results->entry_data->dialog_text = g_locale_to_utf8 (g_strcompress (arg),
+ -1, NULL, NULL, NULL);
break;
case MODE_ERROR:
case MODE_QUESTION:
case MODE_WARNING:
case MODE_INFO:
- results->msg_data->dialog_text = g_strdup (g_strcompress (arg));
+ results->msg_data->dialog_text = g_locale_to_utf8 (g_strcompress (arg),
+ -1, NULL, NULL, NULL);
break;
case MODE_PROGRESS:
- results->progress_data->dialog_text = g_strdup (g_strcompress (arg));
+ results->progress_data->dialog_text = g_locale_to_utf8 (g_strcompress (arg),
+ -1, NULL, NULL, NULL);
break;
default:
zenity_error ("--text", ERROR_SUPPORT);
bgstack15