AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

printing: Always get details of Avahi printers via IPP

Browse Source 
Request details of Avahi browsed printers even when
we've got their PPDs already. Some options are not
present in PPD.

https://bugzilla.gnome.org/show_bug.cgi?id=743323
This commit is contained in:
Marek Kasik 2015-02-20 11:11:01 +01:00
parent 979a4c1b08
commit f74067dda2
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -2614,15 +2614,10 @@ cups_request_printer_info_cb (GtkPrintBackendCups *cups_backend,
set_info_state_message (info); set_info_state_message (info);
printer = gtk_print_backend_find_printer (backend, info->printer_name); printer = gtk_print_backend_find_printer (backend, info->printer_name);
if (printer != NULL && if (printer != NULL)
GTK_PRINTER_CUPS (printer)->ppd_file == NULL) g_object_ref (printer);
{
g_object_ref (printer);
}
else else
{ goto done;
goto done;
}
if (info->got_printer_type && if (info->got_printer_type &&
info->default_printer && info->default_printer &&
@ -3647,23 +3642,7 @@ cups_request_ppd_cb (GtkPrintBackendCups *print_backend,
GTK_PRINTER_CUPS (printer)->reading_ppd = FALSE; GTK_PRINTER_CUPS (printer)->reading_ppd = FALSE;
print_backend->reading_ppds--; print_backend->reading_ppds--;
#ifdef HAVE_CUPS_API_1_6 #ifndef HAVE_CUPS_API_1_6
fstat (g_io_channel_unix_get_fd (data->ppd_io), &data_info);
/* Standalone Avahi printers and raw printers don't have PPD files or have
empty PPD files. Try to get printer details via IPP. */
if (data_info.st_size == 0 ||
(gtk_cups_result_is_error (result) &&
(GTK_PRINTER_CUPS (printer)->avahi_browsed ||
((gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_HTTP) &&
(gtk_cups_result_get_error_status (result) == HTTP_NOT_FOUND)))))
{
cups_request_printer_info (GTK_PRINTER_CUPS (printer)->printer_uri,
GTK_PRINTER_CUPS (printer)->hostname,
GTK_PRINTER_CUPS (printer)->port,
GTK_PRINT_BACKEND_CUPS (gtk_printer_get_backend (printer)));
goto done;
}
#else
if (gtk_cups_result_is_error (result)) if (gtk_cups_result_is_error (result))
{ {
gboolean success = FALSE; gboolean success = FALSE;
@ -3683,12 +3662,36 @@ cups_request_ppd_cb (GtkPrintBackendCups *print_backend,
} }
#endif #endif
if (!gtk_cups_result_is_error (result))
{
/* let ppdOpenFd take over the ownership of the open file */
g_io_channel_seek_position (data->ppd_io, 0, G_SEEK_SET, NULL);
data->printer->ppd_file = ppdOpenFd (dup (g_io_channel_unix_get_fd (data->ppd_io)));
ppdLocalize (data->printer->ppd_file);
ppdMarkDefaults (data->printer->ppd_file);
}
/* let ppdOpenFd take over the ownership of the open file */ #ifdef HAVE_CUPS_API_1_6
g_io_channel_seek_position (data->ppd_io, 0, G_SEEK_SET, NULL); fstat (g_io_channel_unix_get_fd (data->ppd_io), &data_info);
data->printer->ppd_file = ppdOpenFd (dup (g_io_channel_unix_get_fd (data->ppd_io))); /*
ppdLocalize (data->printer->ppd_file); * Standalone Avahi printers and raw printers don't have PPD files or have
ppdMarkDefaults (data->printer->ppd_file); * empty PPD files. Try to get printer details via IPP.
* Always do this for Avahi printers.
*/
if (data_info.st_size == 0 ||
GTK_PRINTER_CUPS (printer)->avahi_browsed ||
(gtk_cups_result_is_error (result) &&
((gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_HTTP) &&
(gtk_cups_result_get_error_status (result) == HTTP_NOT_FOUND))))
{
cups_request_printer_info (GTK_PRINTER_CUPS (printer)->printer_uri,
GTK_PRINTER_CUPS (printer)->hostname,
GTK_PRINTER_CUPS (printer)->port,
GTK_PRINT_BACKEND_CUPS (gtk_printer_get_backend (printer)));
goto done;
}
#endif
gtk_printer_set_has_details (printer, TRUE); gtk_printer_set_has_details (printer, TRUE);
g_signal_emit_by_name (printer, "details-acquired", TRUE); g_signal_emit_by_name (printer, "details-acquired", TRUE);