[Xfce4-commits] r26588 - in xfprint: branches/xfce_4_4/xfprint trunk/xfprint

[Jean-François Wauthy]

Author: pollux
Date: 2008-01-24 19:16:44 +0000 (Thu, 24 Jan 2008)
New Revision: 26588

Modified:
   xfprint/branches/xfce_4_4/xfprint/print_dialog.c
   xfprint/trunk/xfprint/print_dialog.c
Log:
fix segfault when there is no default printer selected in backend (bug #3816)

Modified: xfprint/branches/xfce_4_4/xfprint/print_dialog.c
===================================================================
--- xfprint/branches/xfce_4_4/xfprint/print_dialog.c	2008-01-24 02:15:17 UTC (rev 26587)
+++ xfprint/branches/xfce_4_4/xfprint/print_dialog.c	2008-01-24 19:16:44 UTC (rev 26588)
@@ -406,7 +406,7 @@
                         PRINTER_NAME_COLUMN, printer_data->name, 
                         PRINTER_ALIAS_COLUMN, printer_data->alias ? printer_data->alias : "", -1);
     
-    if (!default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
+    if (default_printer && !default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
       default_printer_found = TRUE;
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox_printer), &iter);
     }

Modified: xfprint/trunk/xfprint/print_dialog.c
===================================================================
--- xfprint/trunk/xfprint/print_dialog.c	2008-01-24 02:15:17 UTC (rev 26587)
+++ xfprint/trunk/xfprint/print_dialog.c	2008-01-24 19:16:44 UTC (rev 26588)
@@ -406,7 +406,7 @@
                         PRINTER_NAME_COLUMN, printer_data->name, 
                         PRINTER_ALIAS_COLUMN, printer_data->alias ? printer_data->alias : "", -1);
     
-    if (!default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
+    if (default_printer && !default_printer_found && g_ascii_strcasecmp (default_printer->name, printer_data->name) == 0) {
       default_printer_found = TRUE;
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (priv->combobox_printer), &iter);
     }