callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Really fix printer URI construction

Browse Source 
svn path=/trunk/; revision=20360
This commit is contained in:
Matthias Clasen
2008-06-12 13:03:35 +00:00
parent dcfefba203
commit e242d89ed3
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-06-12 Matthias Clasen <mclasen@redhat.com>
RH bug 248245 and 449379: cups client printing from gnome
applications fail
* modules/printbackends/cups/gtkprintbackendcups.c: Really fix
printer URI construction. Patch by Marek Kasik
2008-06-12 Michael Natterer <mitch@imendio.com> 2008-06-12 Michael Natterer <mitch@imendio.com>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):

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

@ -433,6 +433,7 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend *print_backend,
GtkCupsRequest *request; GtkCupsRequest *request;
GtkPrintSettings *settings; GtkPrintSettings *settings;
const gchar *title; const gchar *title;
char printer_absolute_uri[HTTP_MAX_URI];
GTK_NOTE (PRINTING, GTK_NOTE (PRINTING,
g_print ("CUPS Backend: %s\n", G_STRFUNC)); g_print ("CUPS Backend: %s\n", G_STRFUNC));
@ -444,12 +445,30 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend *print_backend,
GTK_CUPS_POST, GTK_CUPS_POST,
IPP_PRINT_JOB, IPP_PRINT_JOB,
data_io, data_io,
cups_printer->hostname, NULL,
cups_printer->device_uri); cups_printer->device_uri);
#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1
httpAssembleURIf (HTTP_URI_CODING_ALL,
printer_absolute_uri,
sizeof (printer_absolute_uri),
"ipp",
NULL,
"localhost",
ippPort (),
"/printers/%s",
gtk_printer_get_name (gtk_print_job_get_printer (job)));
#else
g_snprintf (printer_absolute_uri,
sizeof (printer_absolute_uri),
"ipp://localhost:%d/printers/%s",
ippPort (),
gtk_printer_get_name (gtk_print_job_get_printer (job)));
#endif
gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION,
IPP_TAG_URI, "printer-uri", IPP_TAG_URI, "printer-uri",
NULL, cups_printer->printer_uri); NULL, printer_absolute_uri);
title = gtk_print_job_get_title (job); title = gtk_print_job_get_title (job);
if (title) if (title)