rpms/PolicyKit-gnome/F-9 PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch, NONE, 1.1 PolicyKit-gnome.spec, 1.19, 1.20

[David Zeuthen (davidz)]

Author: davidz

Update of /cvs/pkgs/rpms/PolicyKit-gnome/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4681

Modified Files:
	PolicyKit-gnome.spec 
Added Files:
	PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch 
Log Message:
* Thu May  1 2008 David Zeuthen <davidz at redhat.com> - 0.8-4%{?dist}
- Don't spawn stuff under gdm



PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch:

--- NEW FILE PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch ---
diff --git a/src/polkit-gnome-auth-dialog.c b/src/polkit-gnome-auth-dialog.c
index db0ea81..005f08d 100644
--- a/src/polkit-gnome-auth-dialog.c
+++ b/src/polkit-gnome-auth-dialog.c
@@ -542,7 +542,10 @@ static void
 vendor_url_activated (SexyUrlLabel *url_label, char *url, gpointer user_data)
 {
         if (url != NULL) {
-                gnome_vfs_url_show (url);
+		/* don't spawn anything when running under gdm */
+		if (g_getenv ("RUNNING_UNDER_GDM") == NULL) {
+			gnome_vfs_url_show (url);
+		}
         }
 }
 
@@ -553,6 +556,10 @@ action_id_activated (SexyUrlLabel *url_label, char *url, gpointer user_data)
         DBusGConnection *bus;
         DBusGProxy *manager_proxy;
 
+	/* don't spawn anything when running under gdm */
+	if (g_getenv ("RUNNING_UNDER_GDM") != NULL)
+		goto out;
+
         error = NULL;
         bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
         if (bus == NULL) {


Index: PolicyKit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PolicyKit-gnome/F-9/PolicyKit-gnome.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PolicyKit-gnome.spec	17 Apr 2008 22:01:42 -0000	1.19
+++ PolicyKit-gnome.spec	2 May 2008 03:49:53 -0000	1.20
@@ -10,7 +10,7 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: PolicyKit-gnome
 Version: 0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/PolicyKit-gnome.git;a=summary
@@ -35,6 +35,7 @@
 Requires: libsexy >= %{libsexy_version}
 
 Patch0: PolicyKit-gnome-0.8-fix-i18n.patch
+Patch1: PolicyKit-gnome-0.8-dont-spawn-when-running-under-gdm.patch
 
 %description 
 PolicyKit-gnome provides a GNOME integration library and tools for
@@ -78,6 +79,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .fix-i18n
+%patch1 -p1 -b .no-spawning-under-gdm
 
 %build
 %configure
@@ -134,6 +136,9 @@
 %{_datadir}/PolicyKit/policy/polkit-gnome-example.policy
 
 %changelog
+* Thu May  1 2008 David Zeuthen <davidz at redhat.com> - 0.8-4%{?dist}
+- Don't spawn stuff under gdm
+
 * Thu Apr 17 2008 David Zeuthen <davidz at redhat.com> - 0.8-3%{?dist}
 - Fix i18n (#442938)