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

printing: Set printer state correctly

Browse Source 
Consider NULL printer state message as empty too.
Printer state IPP_PRINTER_STOPPED can be considered as paused state.

https://bugzilla.gnome.org/show_bug.cgi?id=743323
This commit is contained in:
Marek Kasik 2015-02-27 16:48:40 +01:00
parent bc77408e3c
commit c2aff4ab6e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2482,7 +2482,7 @@ set_info_state_message (PrinterSetupInfo *info)
{
gint i;
if (info->state_msg && strlen (info->state_msg) == 0)
if (info->state_msg == NULL || strlen (info->state_msg) == 0)
{
gchar *tmp_msg2 = NULL;
if (info->is_paused && !info->is_accepting_jobs)
@ -2751,7 +2751,10 @@ create_cups_printer_from_avahi_data (AvahiConnectionTestData *data)
info->printer_uri = data->printer_uri;
if (data->got_printer_state)
info->state = data->printer_state;
{
info->state = data->printer_state;
info->is_paused = info->state == IPP_PRINTER_STOPPED;
}
info->got_printer_type = data->got_printer_type;
if (data->got_printer_type)