AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

don't try free gettext() values,

Browse Source 
fix a printing dialog crasher (bug 544390)

svn path=/trunk/; revision=20904
This commit is contained in:
Sebastien Bacher 2008-07-24 12:56:59 +00:00
parent c8061385a9
commit 862fde72de
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-07-24 Sebastien Bacher <seb128@ubuntu.com>
* modules/printbackends/cups/gtkprintbackendcups.c:
(cups_printer_get_options): don't try free gettext() values,
fix a printing dialog crasher (bug 544390)
2008-07-24 Cody Russell <bratsche@gnome.org> 2008-07-24 Cody Russell <bratsche@gnome.org>
Bug 544510 – SetTimer callback signatures has the wrong type Bug 544510 – SetTimer callback signatures has the wrong type

10
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -2673,6 +2673,7 @@ cups_printer_get_options (GtkPrinter *printer,
char *cover_display_default[] = {N_("None"), N_("Classified"), N_("Confidential"), N_("Secret"), N_("Standard"), N_("Top Secret"), N_("Unclassified"),}; char *cover_display_default[] = {N_("None"), N_("Classified"), N_("Confidential"), N_("Secret"), N_("Standard"), N_("Top Secret"), N_("Unclassified"),};
char **cover = NULL; char **cover = NULL;
char **cover_display = NULL; char **cover_display = NULL;
char **cover_display_translated = NULL;
gint num_of_covers = 0; gint num_of_covers = 0;
gpointer value; gpointer value;
gint j; gint j;
@ -2682,6 +2683,8 @@ cups_printer_get_options (GtkPrinter *printer,
cover[num_of_covers] = NULL; cover[num_of_covers] = NULL;
cover_display = g_new (char *, num_of_covers + 1); cover_display = g_new (char *, num_of_covers + 1);
cover_display[num_of_covers] = NULL; cover_display[num_of_covers] = NULL;
cover_display_translated = g_new (char *, num_of_covers + 1);
cover_display_translated[num_of_covers] = NULL;
for (i = 0; i < num_of_covers; i++) for (i = 0; i < num_of_covers; i++)
{ {
@ -2697,11 +2700,11 @@ cups_printer_get_options (GtkPrinter *printer,
} }
for (i = 0; i < num_of_covers; i++) for (i = 0; i < num_of_covers; i++)
cover_display[i] = _(cover_display[i]); cover_display_translated[i] = _(cover_display[i]);
option = gtk_printer_option_new ("gtk-cover-before", "Before", GTK_PRINTER_OPTION_TYPE_PICKONE); option = gtk_printer_option_new ("gtk-cover-before", "Before", GTK_PRINTER_OPTION_TYPE_PICKONE);
gtk_printer_option_choices_from_array (option, num_of_covers, gtk_printer_option_choices_from_array (option, num_of_covers,
cover, cover_display); cover, cover_display_translated);
if (backend->default_cover_before != NULL) if (backend->default_cover_before != NULL)
gtk_printer_option_set (option, backend->default_cover_before); gtk_printer_option_set (option, backend->default_cover_before);
@ -2713,7 +2716,7 @@ cups_printer_get_options (GtkPrinter *printer,
option = gtk_printer_option_new ("gtk-cover-after", "After", GTK_PRINTER_OPTION_TYPE_PICKONE); option = gtk_printer_option_new ("gtk-cover-after", "After", GTK_PRINTER_OPTION_TYPE_PICKONE);
gtk_printer_option_choices_from_array (option, num_of_covers, gtk_printer_option_choices_from_array (option, num_of_covers,
cover, cover_display); cover, cover_display_translated);
if (backend->default_cover_after != NULL) if (backend->default_cover_after != NULL)
gtk_printer_option_set (option, backend->default_cover_after); gtk_printer_option_set (option, backend->default_cover_after);
else else
@ -2724,6 +2727,7 @@ cups_printer_get_options (GtkPrinter *printer,
g_strfreev (cover); g_strfreev (cover);
g_strfreev (cover_display); g_strfreev (cover_display);
g_free (cover_display_translated);
} }
option = gtk_printer_option_new ("gtk-print-time", "Print at", GTK_PRINTER_OPTION_TYPE_PICKONE); option = gtk_printer_option_new ("gtk-print-time", "Print at", GTK_PRINTER_OPTION_TYPE_PICKONE);