rpms/gtk2/F-8 gtk2.spec,1.278,1.279 printer-hostname.patch,1.1,1.2

[Marek Kašík (mkasik)]

Author: mkasik

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

Modified Files:
	gtk2.spec printer-hostname.patch 
Log Message:
* Wed Jun 11 2008 - Marek Kasik <mkasik at redhat.com> - 2.12.8-5
- Reworked correction of hostname of printer which is the
- print job sent to.
- Resolves: #248245, #449379



Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-8/gtk2.spec,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- gtk2.spec	23 May 2008 12:49:58 -0000	1.278
+++ gtk2.spec	11 Jun 2008 13:58:10 -0000	1.279
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -47,6 +47,7 @@
 Patch5: printer-state.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=248245
+# https://bugzilla.redhat.com/show_bug.cgi?id=449379
 Patch6: printer-hostname.patch
 
 BuildRequires: atk-devel >= %{atk_version}
@@ -323,6 +324,11 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Jun 11 2008 - Marek Kasik <mkasik at redhat.com> - 2.12.8-5
+- Reworked correction of hostname of printer which is the
+- print job sent to.
+- Resolves: #248245, #449379
+
 * Fri May 23 2008 - Marek Kasik <mkasik at redhat.com> - 2.12.8-4
 - Correction of hostname of printer which is the print job sent to.
 - Resolves: #248245

printer-hostname.patch:

Index: printer-hostname.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-8/printer-hostname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- printer-hostname.patch	23 May 2008 12:49:58 -0000	1.1
+++ printer-hostname.patch	11 Jun 2008 13:58:11 -0000	1.2
@@ -1,11 +1,39 @@
---- modules/printbackends/cups/gtkprintbackendcups.c	2008-05-22 14:35:56.000000000 +0200
-+++ modules/printbackends/cups/gtkprintbackendcups.c	2008-05-22 14:42:23.000000000 +0200
-@@ -423,7 +423,7 @@ gtk_print_backend_cups_print_stream (Gtk
-                                   GTK_CUPS_POST,
-                                   IPP_PRINT_JOB,
- 				  data_io,
--				  NULL,
-+				  cups_printer->hostname,
+--- modules/printbackends/cups/gtkprintbackendcups.c	2008-06-11 13:08:29.000000000 +0200
++++ modules/printbackends/cups/gtkprintbackendcups.c	2008-06-11 13:07:57.000000000 +0200
+@@ -412,6 +412,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));   
+@@ -426,9 +427,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)