[gtk+/gtk-3-14] printing: Set printer state correctly

[Marek Kašík <mkasik src gnome org>]

commit 6e5e282b59e3b514e87b38f085c515f60686c5e6
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 b3d6033..dfb8497 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -2408,7 +2408,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)
@@ -2663,7 +2663,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)