rpms/gnome-session/devel gnome-session-2.15.91-http-proxy.patch, 1.1, 1.2 gnome-session.spec, 1.89, 1.90

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-session/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23651

Modified Files:
	gnome-session-2.15.91-http-proxy.patch gnome-session.spec 
Log Message:
- don't hose users with a stale http_proxy variable if they
  use autoconfiguration and uses to use manual configuration.
  Patch by Mark McLoughlin (bug 212319)


gnome-session-2.15.91-http-proxy.patch:
 headers.h |    9 +++++++
 main.c    |   79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)

Index: gnome-session-2.15.91-http-proxy.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session-2.15.91-http-proxy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-session-2.15.91-http-proxy.patch	6 Sep 2006 16:04:44 -0000	1.1
+++ gnome-session-2.15.91-http-proxy.patch	26 Oct 2006 14:26:17 -0000	1.2
@@ -1,5 +1,5 @@
---- gnome-session-2.15.91/gnome-session/main.c.http_proxy	2006-09-06 09:52:45.000000000 -0400
-+++ gnome-session-2.15.91/gnome-session/main.c	2006-09-06 11:13:07.000000000 -0400
+--- gnome-session-2.16.1/gnome-session/main.c.http-proxy	2006-10-26 10:24:29.000000000 -0400
++++ gnome-session-2.16.1/gnome-session/main.c	2006-10-26 10:28:09.000000000 -0400
 @@ -133,6 +133,77 @@
      }
  }
@@ -26,7 +26,7 @@
 +
 +  host = gconf_client_get_string (gconf_client, HTTP_PROXY_HOST_KEY, NULL);
 +
-+  if (host == NULL)
++  if (host == NULL || hosts[0] == '\0')
 +    {
 +      g_unsetenv ("http_proxy");
 +      return;
@@ -78,7 +78,7 @@
  /* Point GTK_RC_FILES at a separate file that we change in
   * in gnome-settings-daemon.
   */
-@@ -432,6 +490,14 @@
+@@ -430,6 +501,14 @@
    g_free (display_str);
    putenv (ep);
  
@@ -93,8 +93,8 @@
    ignore (SIGPIPE);
  
    /* Need DISPLAY set */
---- gnome-session-2.15.91/gnome-session/headers.h.http_proxy	2006-09-06 10:02:39.000000000 -0400
-+++ gnome-session-2.15.91/gnome-session/headers.h	2006-09-06 11:04:13.000000000 -0400
+--- gnome-session-2.16.1/gnome-session/headers.h.http-proxy	2006-07-26 08:46:36.000000000 -0400
++++ gnome-session-2.16.1/gnome-session/headers.h	2006-10-26 10:24:29.000000000 -0400
 @@ -74,6 +74,15 @@
  /* Assistive Technology support is turned on */
  #define ACCESSIBILITY_KEY         "/desktop/gnome/interface/accessibility"


Index: gnome-session.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gnome-session.spec	22 Oct 2006 01:20:37 -0000	1.89
+++ gnome-session.spec	26 Oct 2006 14:26:17 -0000	1.90
@@ -14,7 +14,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.16.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -195,6 +195,11 @@
 %{_datadir}/gnome/autostart
 
 %changelog
+* Thu Oct 26 2006 Ray Strode <rstrode at redhat.com> - 2.16.1-2.fc6
+- don't hose users with a stale http_proxy variable if they
+  use autoconfiguration and uses to use manual configuration.
+  Patch by Mark McLoughlin (bug 212319)
+
 * Sat Oct 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.1-1
 - Update to 2.16.1