rpms/gtk2/F-9 printer-hostname.patch, NONE, 1.1 gtk2.spec, 1.291, 1.292

[Marek Kašík (mkasik)]

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30257

Modified Files:
	gtk2.spec 
Added Files:
	printer-hostname.patch 
Log Message:
* Thu Jun 12 2008 - Marek Kasik <mkasik at redhat.com> - 2.12.10-3
- Correction of hostname of printer which is the print job sent to.
- Resolves: #248245


printer-hostname.patch:

--- NEW FILE printer-hostname.patch ---
--- modules/printbackends/cups/gtkprintbackendcups.c	2008-06-11 13:24:18.000000000 +0200
+++ modules/printbackends/cups/gtkprintbackendcups.c	2008-06-11 13:25:49.000000000 +0200
@@ -414,6 +414,7 @@ gtk_print_backend_cups_print_stream (Gtk
   GtkCupsRequest *request;
   GtkPrintSettings *settings;
   const gchar *title;
+  char  printer_absolute_uri[HTTP_MAX_URI];
 
   GTK_NOTE (PRINTING,
             g_print ("CUPS Backend: %s\n", G_STRFUNC));   
@@ -428,9 +429,27 @@ gtk_print_backend_cups_print_stream (Gtk
 				  NULL,
 				  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, 
                                    IPP_TAG_URI, "printer-uri",
-                                   NULL, cups_printer->printer_uri);
+                                   NULL, printer_absolute_uri);
 
   title = gtk_print_job_get_title (job);
   if (title)


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-9/gtk2.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- gtk2.spec	8 Jun 2008 05:16:11 -0000	1.291
+++ gtk2.spec	12 Jun 2008 12:46:57 -0000	1.292
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -49,6 +49,9 @@
 # fixed in upstream svn
 Patch11: geometry.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=248245
+Patch12: printer-hostname.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -130,6 +133,7 @@
 %patch4 -p1 -b .im-setting
 %patch10 -p0 -b .printer-state
 %patch11 -p1 -b .geometry
+%patch12 -p0 -b .printer-hostname
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -322,6 +326,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Jun 12 2008 - Marek Kasik <mkasik at redhat.com> - 2.12.10-3
+- Correction of hostname of printer which is the print job sent to.
+- Resolves: #248245
+
 * Sun Jun  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.12.10-2
 - Fix a coordinate system problem