diff options
| author | Marek Kasik <mkasik@redhat.com> | 2011-09-29 15:57:26 +0200 |
|---|---|---|
| committer | Marek Kasik <mkasik@redhat.com> | 2011-09-29 15:57:26 +0200 |
| commit | bc037574136b8714bb2fc0fdebe0c01ce304ea89 (patch) | |
| tree | a54a907fc592f97d905ee4834d51b629ddc3ed46 | |
| parent | 238fd9f5b1cba960dd30eb2670f90a5cd8cb236a (diff) | |
| download | gnome-control-center-bc037574136b8714bb2fc0fdebe0c01ce304ea89.tar.gz | |
Printers: Move check for availability of CUPS to better place
Fixes problem of not showing information about stopped CUPS and
missing printers.
| -rw-r--r-- | 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 ab6bf3ec4..2b45a1a7c 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, |