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

[Marek Kašík]

Author: mkasik

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

Modified Files:
	cups-unix-domain-socket.patch gtk2.spec 
Log Message:
* Mon Sep  8 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-3
- Add a comment of the Unix domain socket connection with CUPS
  and a little modification of the previous patch


cups-unix-domain-socket.patch:

Index: cups-unix-domain-socket.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-9/cups-unix-domain-socket.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-unix-domain-socket.patch	4 Sep 2008 13:20:04 -0000	1.1
+++ cups-unix-domain-socket.patch	8 Sep 2008 12:52:37 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- modules/printbackends/cups/gtkprintbackendcups.c	2008-09-08 12:07:55.000000000 +0200
++++ modules/printbackends/cups/gtkprintbackendcups.c	2008-09-08 13:11:58.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 */
@@ -8,20 +8,24 @@
  	  
            list_has_changed = TRUE;
  	  cups_printer = gtk_printer_cups_new (printer_name, backend);
-@@ -1227,8 +1228,14 @@ cups_request_printer_list_cb (GtkPrintBa
+@@ -1227,9 +1228,20 @@ 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] == '/')))
+ 	  if (strcasecmp (uri, hostname) == 0)
+ 	    strcpy (hostname, "localhost");
+ 
++          /* if the cups server is local and listening at a unix domain socket 
++           * then use the socket connection
++           */
++	  if ((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.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- gtk2.spec	4 Sep 2008 13:20:04 -0000	1.296
+++ gtk2.spec	8 Sep 2008 12:52:37 -0000	1.297
@@ -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
@@ -329,6 +329,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Sep  8 2008 Marek Kasik <mkasik at redhat.com> - 2.12.11-3
+- Add a comment of the Unix domain socket connection with CUPS
+  and a little modification of the previous patch
+
 * 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