[gnome-control-center/gnome-3-0] Printers: Move check for availability of CUPS to better place

[Marek KaÅÃk <mkasik src gnome org>]

commit bc037574136b8714bb2fc0fdebe0c01ce304ea89
Author: Marek Kasik <mkasik redhat com>
Date:   Thu Sep 29 15:57:26 2011 +0200

    Printers: Move check for availability of CUPS to better place
    
    Fixes problem of not showing information about stopped CUPS and
    missing printers.

 panels/printers/cc-printers-panel.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index ab6bf3e..2b45a1a 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -855,20 +855,6 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
     }
   else
     {
-      http_t *http = NULL;
-
-      widget = (GtkWidget*)
-        gtk_builder_get_object (priv->builder, "notebook");
-
-      http = httpConnectEncrypt (cupsServer (), ippPort (), cupsEncryption ());
-      if (http)
-        {
-          httpClose (http);
-          gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_NO_PRINTERS_PAGE);
-        }
-      else
-        gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_NO_CUPS_PAGE);
-
       widget = (GtkWidget*)
         gtk_builder_get_object (priv->builder, "printer-name-label");
       gtk_label_set_text (GTK_LABEL (widget), "");
@@ -906,8 +892,10 @@ actualize_printers_list (CcPrintersPanel *self)
   GtkTreeView            *treeview;
   GtkTreeIter             iter;
   cups_job_t             *jobs = NULL;
+  GtkWidget              *widget;
   gboolean                paused = FALSE;
   gboolean                valid = FALSE;
+  http_t                 *http;
   gchar                  *current_printer_instance = NULL;
   gchar                  *current_printer_name = NULL;
   gchar                  *printer_icon_name = NULL;
@@ -944,6 +932,18 @@ actualize_printers_list (CcPrintersPanel *self)
 
   if (priv->num_dests == 0)
     {
+      widget = (GtkWidget*)
+        gtk_builder_get_object (priv->builder, "notebook");
+
+      http = httpConnectEncrypt (cupsServer (), ippPort (), cupsEncryption ());
+      if (http)
+        {
+          httpClose (http);
+          gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_NO_PRINTERS_PAGE);
+        }
+      else
+        gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), NOTEBOOK_NO_CUPS_PAGE);
+
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
                           PRINTER_ID_COLUMN, 0,