minecraft-pi-reborn/zenity
Archived
1
0
Fork 0
Code Pull Requests Activity

Update. Update. Patch from Toshi to fix encoding of passed text strings.

Browse Source 
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.
This commit is contained in:
Glynn Foster 2003-09-04 10:33:00 +00:00 committed by Glynn Foster
parent 8f6f856ac5
commit f3ea9c41a2
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 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. wrapper.
2003-09-01 Glynn Foster <glynn.foster@sun.com> 2003-09-01 Glynn Foster <glynn.foster@sun.com>

2
THANKS
View File

@ -6,10 +6,12 @@ Nicholas Curran <quasar@austar.net.au>
John Fleck <jfleck@inkstain.net> John Fleck <jfleck@inkstain.net>
James Henstridge <james@daa.com.au> James Henstridge <james@daa.com.au>
Mihai T. Lazarescu <mihai@email.it> Mihai T. Lazarescu <mihai@email.it>
Buhan Milne <bhmilne@linux-mandrake.com>
Mike Newman <mike@gtnorthern.demon.co.uk> Mike Newman <mike@gtnorthern.demon.co.uk>
Havoc Pennington <hp@redhat.com> Havoc Pennington <hp@redhat.com>
Kevin C. Krinke <kckrinke@opendoorsoftware.com> Kevin C. Krinke <kckrinke@opendoorsoftware.com>
Kristian Rietveld <kris@gtk.org> Kristian Rietveld <kris@gtk.org>
Jakub Steiner <jimmac@ximian.com> Jakub Steiner <jimmac@ximian.com>
Danel d'Surreal <dagmar@speakeasy.net> Danel d'Surreal <dagmar@speakeasy.net>
Hidetoshi Tajima <hidetoshi.tajima@sun.com>
Tom Tromey <tromey@redhat.com> Tom Tromey <tromey@redhat.com>

2
src/about.c
View File

@ -57,12 +57,14 @@ static const gchar *author_credits[] = {
"John Fleck <jfleck@inkstain.net>", "John Fleck <jfleck@inkstain.net>",
"James Henstridge <james@daa.com.au>", "James Henstridge <james@daa.com.au>",
"Mihai T. Lazarescu <mihai@email.it>", "Mihai T. Lazarescu <mihai@email.it>",
"Buhan Milne <bgmilne@linux-mandrake.com>",
"Mike Newman <mikegtn@gnome.org>", "Mike Newman <mikegtn@gnome.org>",
"Havoc Pennington <hp@redhat.com>", "Havoc Pennington <hp@redhat.com>",
"Kevin C. Krinke <kckrinke@opendoorsoftware.com>", "Kevin C. Krinke <kckrinke@opendoorsoftware.com>",
"Kristian Rietveld <kris@gtk.org>", "Kristian Rietveld <kris@gtk.org>",
"Jakub Steiner <jimmac@ximian.com>", "Jakub Steiner <jimmac@ximian.com>",
"Daniel d'Surreal <dagmar@speakeasy.net>", "Daniel d'Surreal <dagmar@speakeasy.net>",
"Hidetoshi Tajima <hidetoshi.tajima@sun.com>",
"Tom Tromey <tromey@redhat.com>", "Tom Tromey <tromey@redhat.com>",
NULL NULL
}; };

16
src/main.c
View File

@ -939,7 +939,9 @@ zenity_init_parsing_options (void) {
/* Give some sensible defaults */ /* Give some sensible defaults */
results->data->width = -1; results->data->width = -1;
results->data->height = -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->day = 0;
results->calendar_data->month = 0; results->calendar_data->month = 0;
results->calendar_data->year = 0; results->calendar_data->year = 0;
@ -1239,19 +1241,23 @@ zenity_parse_options_callback (poptContext ctx,
switch (results->mode) { switch (results->mode) {
case MODE_CALENDAR: 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; break;
case MODE_ENTRY: 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; break;
case MODE_ERROR: case MODE_ERROR:
case MODE_QUESTION: case MODE_QUESTION:
case MODE_WARNING: case MODE_WARNING:
case MODE_INFO: 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; break;
case MODE_PROGRESS: 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; break;
default: default:
zenity_error ("--text", ERROR_SUPPORT); zenity_error ("--text", ERROR_SUPPORT);