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

This commit is contained in:
Benjamin Berg 2012-01-17 20:33:32 +01:00
parent 5123cfe5e6
commit 85099bf6a6

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]);
}
}
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
else