Check if option is NULL before using it. (#348014, Christian Persch)

2006-07-19  Matthias Clasen  <mclasen@redhat.com>

	* modules/printbackends/file/gtkprintbackendfile.c
	(file_printer_get_settings_from_options): Check if option
	is NULL before using it.  (#348014, Christian Persch)
This commit is contained in:
Matthias Clasen 2006-07-19 15:52:48 +00:00 committed by Matthias Clasen
parent b1d1801875
commit cb3669e1a1
3 changed files with 10 additions and 1 deletions

View File

@ -1,5 +1,9 @@
2006-07-19 Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/file/gtkprintbackendfile.c
(file_printer_get_settings_from_options): Check if option
is NULL before using it. (#348014, Christian Persch)
* gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking
up a font XID, add the XID_FONT_BIT. (#348001)

View File

@ -1,5 +1,9 @@
2006-07-19 Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/file/gtkprintbackendfile.c
(file_printer_get_settings_from_options): Check if option
is NULL before using it. (#348014, Christian Persch)
* gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking
up a font XID, add the XID_FONT_BIT. (#348001)

View File

@ -540,7 +540,8 @@ file_printer_get_settings_from_options (GtkPrinter *printer,
gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_URI, option->value);
option = gtk_printer_option_set_lookup (options, "output-file-format");
gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT, option->value);
if (option)
gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT, option->value);
}
static void