[gtk+] printing: Set printer state correctly
- From: Marek Kašík <mkasik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] printing: Set printer state correctly
- Date: Mon, 2 Mar 2015 09:52:29 +0000 (UTC)
commit c2aff4ab6edbc97ed535b1f0acb95e86c623447e
Author: Marek Kasik <mkasik redhat com>
Date: Fri Feb 27 16:48:40 2015 +0100
printing: Set printer state correctly
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
modules/printbackends/cups/gtkprintbackendcups.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c
b/modules/printbackends/cups/gtkprintbackendcups.c
index 00df2e4..7cd3841 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]