- Disallow launchers when running under GDM.

This commit is contained in:
William Jon McCann 2008-03-31 22:41:00 +00:00
parent ed5ba6af32
commit 08beddc77d
2 changed files with 29 additions and 1 deletions

21
yelp-under-gdm.patch Normal file
View File

@ -0,0 +1,21 @@
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);

View File

@ -20,7 +20,7 @@
Summary: A system documentation reader from the Gnome project Summary: A system documentation reader from the Gnome project
Name: yelp Name: yelp
Version: 2.22.0 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 Source: http://ftp.gnome.org/pub/GNOME/sources/yelp/2.21/%{name}-%{version}.tar.bz2
URL: http://live.gnome.org/Yelp URL: http://live.gnome.org/Yelp
# http://bugzilla.gnome.org/show_bug.cgi?id=319096 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
@ -37,6 +37,9 @@ Patch9: yelp-2.21.2-libxul.patch
# RH bug #437328 / GNOME bug #511244 # RH bug #437328 / GNOME bug #511244
Patch10: yelp-2.22.0-beagle-search.patch 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 # http://bugzilla.gnome.org/show_bug.cgi?id=431077
# XXX Does this no longer apply to yelp >= 2.19.1 ? # XXX Does this no longer apply to yelp >= 2.19.1 ?
#Patch8: yelp-2.18.1-posix-man.patch #Patch8: yelp-2.18.1-posix-man.patch
@ -99,6 +102,7 @@ one central tool.
%patch8 -p1 -b .xl2 %patch8 -p1 -b .xl2
%patch9 -p1 -b .libxul %patch9 -p1 -b .libxul
%patch10 -p1 -b .beagle-search %patch10 -p1 -b .beagle-search
%patch11 -p1 -b .under-gdm
%build %build
@ -163,6 +167,9 @@ update-desktop-database &> /dev/null ||:
%{_datadir}/yelp %{_datadir}/yelp
%changelog %changelog
* Mon Mar 31 2008 Jon McCann <jmccann@redhat.com> - 2.22.0-4
- Disallow launchers when running under GDM.
* Mon Mar 31 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-3 * Mon Mar 31 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-3
- Update patch for RH bug #437328. - Update patch for RH bug #437328.