AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Strip "Custom." prefix when getting default options from cups.

Browse Source
This commit is contained in:
Benjamin Berg 2012-01-17 20:33:32 +01:00
parent b9509ec15d
commit 27f3c3c031
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3382,8 +3382,19 @@ create_pickone_option (ppd_file_t *ppd_file,
option->choices_display[i] = get_choice_text (ppd_file, available[i]); option->choices_display[i] = get_choice_text (ppd_file, available[i]);
} }
} }
if (option->type != GTK_PRINTER_OPTION_TYPE_PICKONE)
{
if (g_str_has_prefix (ppd_option->defchoice, "Custom."))
gtk_printer_option_set (option, ppd_option->defchoice + 7);
else
gtk_printer_option_set (option, ppd_option->defchoice); gtk_printer_option_set (option, ppd_option->defchoice);
} }
else
{
gtk_printer_option_set (option, ppd_option->defchoice);
}
}
#ifdef PRINT_IGNORED_OPTIONS #ifdef PRINT_IGNORED_OPTIONS
else else
g_warning ("CUPS Backend: Ignoring pickone %s\n", ppd_option->text); g_warning ("CUPS Backend: Ignoring pickone %s\n", ppd_option->text);