Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=98b0c6285504f1128ddafbb656023112e81e6459

commit 98b0c6285504f1128ddafbb656023112e81e6459
Author: Baste <[email protected]>
Date:   Fri Mar 23 09:21:14 2012 +0100

gdm-3.3.92.1-2-x86_64
* Add slave.patch

diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild
index a7172de..16417dc 100644
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gdm
pkgver=3.3.92.1
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME Display Manager"
url="http://www.gnome.org/";
backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin \
@@ -19,9 +19,10 @@ archs=('i686' 'x86_64')
_F_gnome_git="n"
_F_gnome_ext=".tar.xz"
Finclude gnome
-source=($source org.gnome.login-screen.gschema.override)
+source=($source org.gnome.login-screen.gschema.override slave.diff)
sha1sums=('ca3d72dfd7efb0b141c2581c82d886841781b735' \
-          '974832a3878a020c87a833f5ba99a0c7d5d27b57')
+          '974832a3878a020c87a833f5ba99a0c7d5d27b57' \
+          '4c9b94a52eb265f795da5826f34b42a9dddf5a77')
if [ "$_F_gnome_git" != "n" ]; then
unset sha1sums
fi
@@ -39,7 +40,7 @@ build() {
Fcd $pkgname
sh ./autogen.sh
fi
-
+       Fpatchall
Fmake --enable-authentication-scheme=pam \
--enable-console-helper \
--disable-scrollkeeper \
diff --git a/source/gnome/gdm/slave.diff b/source/gnome/gdm/slave.diff
new file mode 100644
index 0000000..d5121b8
--- /dev/null
+++ b/source/gnome/gdm/slave.diff
@@ -0,0 +1,51 @@
+From a607500107b595459a54a045b20c1a5828b66d92 Mon Sep 17 00:00:00 2001
+From: Ray Strode <[email protected]>
+Date: Thu, 22 Mar 2012 14:54:43 +0000
+Subject: slave: don't jump to text vts
+
+commit fb6a3cf203c7fda3a9a33d3e3b4e7a7b868cb43e fixed
+user-switching so that we always migrate to a pre-existing
+session if it's runninng.
+
+Unfortunately, we didn't filter out tty sessions.
+
+This commit ensures GDM only jumps to graphical sessions.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672630
+---
+diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
+index f1f4c47..6e1b45c 100644
+--- a/daemon/gdm-slave.c
++++ b/daemon/gdm-slave.c
+@@ -1344,9 +1344,28 @@ gdm_slave_get_primary_session_id_for_user_from_systemd 
(GdmSlave   *slave,
+         }
+
+         for (i = 0; sessions[i] != NULL; i++) {
++                char *type;
+                 gboolean is_active;
++                gboolean is_x11;
+                 uid_t other;
+
++                res = sd_session_get_type (sessions[i], &type);
++
++                if (res < 0) {
++                        g_warning ("GdmSlave: could not fetch type of session 
'%s': %s",
++                                   sessions[i], strerror (-res));
++                        continue;
++                }
++
++                is_x11 = g_strcmp0 (type, "x11") == 0;
++                g_free (type);
++
++                /* Only migrate to graphical sessions
++                 */
++                if (!is_x11) {
++                        continue;
++                }
++
+                 /* Always give preference to non-active sessions,
+                  * so we migrate when we can and don't when we can't
+                  */
+--
+cgit v0.9.0.2
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to