AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 09:00:34 +00:00
Code Issues 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 5123cfe5e6
commit 85099bf6a6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3367,7 +3367,18 @@ 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]);
} }
} }
gtk_printer_option_set (option, ppd_option->defchoice);
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);
}
else
{
gtk_printer_option_set (option, ppd_option->defchoice);
}
} }
#ifdef PRINT_IGNORED_OPTIONS #ifdef PRINT_IGNORED_OPTIONS
else else