rpms/gtk2/F-9 cups-unix-domain-socket.patch, NONE, 1.1 gtk2.spec, 1.295, 1.296

[Marek Kašík]

Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29000

Modified Files:
	gtk2.spec 
Added Files:
	cups-unix-domain-socket.patch 
Log Message:
* Thu Sep  4 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-2
- Add ability to comunicate with CUPS through Unix domain socket
- Resolves: #455742


cups-unix-domain-socket.patch:

--- NEW FILE cups-unix-domain-socket.patch ---
--- modules/printbackends/cups/gtkprintbackendcups.c	2008-09-03 16:58:29.000000000 +0200
+++ modules/printbackends/cups/gtkprintbackendcups.c	2008-09-03 16:57:39.000000000 +0200
@@ -1181,6 +1181,7 @@ cups_request_printer_list_cb (GtkPrintBa
 	  char hostname[HTTP_MAX_URI];	/* Hostname */
 	  char resource[HTTP_MAX_URI];	/* Resource name */
 	  int  port;			/* Port number */
+	  char *cups_server;            /* CUPS server */
 	  
           list_has_changed = TRUE;
 	  cups_printer = gtk_printer_cups_new (printer_name, backend);
@@ -1227,8 +1228,14 @@ cups_request_printer_list_cb (GtkPrintBa
             }
 
 	  gethostname (uri, sizeof (uri));
-	  if (strcasecmp (uri, hostname) == 0)
-	    strcpy (hostname, "localhost");
+	  cups_server = g_strdup (cupsServer());
+
+	  if ((strcasecmp (uri, hostname) == 0) ||
+	      ((strstr (hostname, "localhost") != NULL) &&
+	       (cups_server[0] == '/')))
+	    strcpy (hostname, cups_server);
+
+	  g_free (cups_server);
 
 	  cups_printer->hostname = g_strdup (hostname);
 	  cups_printer->port = port;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-9/gtk2.spec,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -r1.295 -r1.296
--- gtk2.spec	1 Jul 2008 22:05:46 -0000	1.295
+++ gtk2.spec	4 Sep 2008 13:20:04 -0000	1.296
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.12/gtk+-%{version}.tar.bz2
@@ -52,6 +52,9 @@
 # fixed upstream
 Patch14: empty-modmap-crash.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=455742
+Patch15: cups-unix-domain-socket.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -133,6 +136,7 @@
 %patch4 -p1 -b .im-setting
 %patch10 -p0 -b .printer-state
 %patch13 -p0 -b .printer-paper-size
+%patch15 -p0 -b .cuds
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -325,6 +329,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Sep  4 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-2
+- Add ability to comunicate with CUPS through Unix domain socket
+- Resolves: #455742
+
 * Tue Jul  1 2008 Matthias Clasen <mclasen at redhat.com> - 2.12.11-1
 - Update to 2.12.11