rpms/yelp/devel yelp-under-gdm.patch, NONE, 1.1 yelp.spec, 1.132, 1.133

[William Jon McCann (mccann)]

Author: mccann

Update of /cvs/pkgs/rpms/yelp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21656

Modified Files:
	yelp.spec 
Added Files:
	yelp-under-gdm.patch 
Log Message:
- Disallow launchers when running under GDM.



yelp-under-gdm.patch:

--- NEW FILE yelp-under-gdm.patch ---
Index: yelp/src/yelp-window.c
===================================================================
--- yelp/src/yelp-window.c	(revision 3119)
+++ yelp/src/yelp-window.c	(working copy)
@@ -1057,6 +1057,16 @@ yelp_window_load (YelpWindow *window, co
 		gint status = 0;
 		GError *error = NULL;
 
+		/* disallow external links when running in the GDM greeter session */
+		if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
+		    gchar *message = g_strdup_printf (_("The requested URI \"%s\" is invalid"), trace_uri);
+
+		    window_error (window, _("Unable to load page"), message, FALSE);
+		    g_free (message);
+
+		    return;
+		}
+
 		priv->base_uri = g_strdup ("file:///fakefile");
 
 		cmd = g_strdup_printf ("gnome-open %s", uri);


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- yelp.spec	31 Mar 2008 14:31:56 -0000	1.132
+++ yelp.spec	31 Mar 2008 22:41:00 -0000	1.133
@@ -20,7 +20,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.21/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@@ -37,6 +37,9 @@
 # RH bug #437328 / GNOME bug #511244
 Patch10: yelp-2.22.0-beagle-search.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=525447
+Patch11: yelp-under-gdm.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=431077 
 # XXX Does this no longer apply to yelp >= 2.19.1 ?
 #Patch8: yelp-2.18.1-posix-man.patch
@@ -99,6 +102,7 @@
 %patch8 -p1 -b .xl2
 %patch9 -p1 -b .libxul
 %patch10 -p1 -b .beagle-search
+%patch11 -p1 -b .under-gdm
 
 
 %build
@@ -163,6 +167,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Mon Mar 31 2008 Jon McCann <jmccann at redhat.com> - 2.22.0-4
+- Disallow launchers when running under GDM.
+
 * Mon Mar 31 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.0-3
 - Update patch for RH bug #437328.