applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Printers: Move check for availability of CUPS to better place

Browse source 
Fixes problem of not showing information about stopped CUPS and
missing printers.
This commit is contained in:
Marek Kasik 2011-06-03 12:51:57 +02:00
parent 5912f00273
commit 3fe26cfe50
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
panels/printers/cc-printers-panel.c
View file

@ -870,20 +870,6 @@ printer_selection_changed_cb (GtkTreeSelection *selection,
} }
else 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*) widget = (GtkWidget*)
gtk_builder_get_object (priv->builder, "printer-name-label"); gtk_builder_get_object (priv->builder, "printer-name-label");
cc_editable_entry_set_text (CC_EDITABLE_ENTRY (widget), ""); cc_editable_entry_set_text (CC_EDITABLE_ENTRY (widget), "");
@ -921,8 +907,10 @@ actualize_printers_list (CcPrintersPanel *self)
GtkTreeView *treeview; GtkTreeView *treeview;
GtkTreeIter iter; GtkTreeIter iter;
cups_job_t *jobs = NULL; cups_job_t *jobs = NULL;
GtkWidget *widget;
gboolean paused = FALSE; gboolean paused = FALSE;
gboolean valid = FALSE; gboolean valid = FALSE;
http_t *http;
gchar *current_printer_instance = NULL; gchar *current_printer_instance = NULL;
gchar *current_printer_name = NULL; gchar *current_printer_name = NULL;
gchar *printer_icon_name = NULL; gchar *printer_icon_name = NULL;
@ -959,6 +947,18 @@ actualize_printers_list (CcPrintersPanel *self)
if (priv->num_dests == 0) 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_append (store, &iter);
gtk_list_store_set (store, &iter, gtk_list_store_set (store, &iter,
PRINTER_ID_COLUMN, 0, PRINTER_ID_COLUMN, 0,