diff options
| author | Marek Kasik <mkasik@redhat.com> | 2009-09-23 14:35:26 +0200 |
|---|---|---|
| committer | Marek Kasik <mkasik@redhat.com> | 2009-09-23 14:35:26 +0200 |
| commit | 5f4915f62403ddb2502fa7b431a97943c9b56b88 (patch) | |
| tree | 802a9174e86e5e339019997f6875ece301098cc0 /gtk/gtkprintunixdialog.c | |
| parent | 915957fca35ead312f7327ce59a73eb301024faf (diff) | |
| download | gtk+-5f4915f62403ddb2502fa7b431a97943c9b56b88.tar.gz | |
Don't hang print dialog when remote CUPS printer is not available
This patch tests availability of remote host before getting ppd file
for selected printer (#586207). It also adds a state message for
failure of getting details.
Diffstat (limited to 'gtk/gtkprintunixdialog.c')
| -rw-r--r-- | gtk/gtkprintunixdialog.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index d08cdfbc58..5f9d8d28ac 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -596,7 +596,7 @@ gtk_print_unix_dialog_destroy (GtkPrintUnixDialog *dialog) } static void -disconnect_printer_details_request (GtkPrintUnixDialog *dialog) +disconnect_printer_details_request (GtkPrintUnixDialog *dialog, gboolean details_failed) { GtkPrintUnixDialogPrivate *priv = dialog->priv; @@ -606,12 +606,20 @@ disconnect_printer_details_request (GtkPrintUnixDialog *dialog) priv->request_details_tag); priv->request_details_tag = 0; set_busy_cursor (dialog, FALSE); - gtk_list_store_set (GTK_LIST_STORE (priv->printer_list), - g_object_get_data (G_OBJECT (priv->request_details_printer), - "gtk-print-tree-iter"), - PRINTER_LIST_COL_STATE, - gtk_printer_get_state_message (priv->request_details_printer), - -1); + if (details_failed) + gtk_list_store_set (GTK_LIST_STORE (priv->printer_list), + g_object_get_data (G_OBJECT (priv->request_details_printer), + "gtk-print-tree-iter"), + PRINTER_LIST_COL_STATE, + _("Getting printer information failed"), + -1); + else + gtk_list_store_set (GTK_LIST_STORE (priv->printer_list), + g_object_get_data (G_OBJECT (priv->request_details_printer), + "gtk-print-tree-iter"), + PRINTER_LIST_COL_STATE, + gtk_printer_get_state_message (priv->request_details_printer), + -1); g_object_unref (priv->request_details_printer); priv->request_details_printer = NULL; } @@ -626,7 +634,7 @@ gtk_print_unix_dialog_finalize (GObject *object) GList *node; unschedule_idle_mark_conflicts (dialog); - disconnect_printer_details_request (dialog); + disconnect_printer_details_request (dialog, FALSE); if (priv->current_printer) { @@ -1781,7 +1789,7 @@ printer_details_acquired (GtkPrinter *printer, { GtkPrintUnixDialogPrivate *priv = dialog->priv; - disconnect_printer_details_request (dialog); + disconnect_printer_details_request (dialog, !success); if (success) { @@ -1809,7 +1817,7 @@ selected_printer_changed (GtkTreeSelection *selection, priv->waiting_for_printer = NULL; } - disconnect_printer_details_request (dialog); + disconnect_printer_details_request (dialog, FALSE); printer = NULL; if (gtk_tree_selection_get_selected (selection, NULL, &filter_iter)) |