diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-26 04:11:52 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-26 04:11:52 +0800 |
| commit | cb5ee1ee2cba0aaa9b8f40c3967718ecd91a8cb8 (patch) | |
| tree | 77c636ae67b9c42cb6b1d7d6d3bdf7cd5d0a7d5f | |
| parent | 58334020bf690bc9b0ca9d3e30d534c800c773e6 (diff) | |
| download | marcuscom-ports-cb5ee1ee2cba0aaa9b8f40c3967718ecd91a8cb8.tar marcuscom-ports-cb5ee1ee2cba0aaa9b8f40c3967718ecd91a8cb8.tar.gz marcuscom-ports-cb5ee1ee2cba0aaa9b8f40c3967718ecd91a8cb8.tar.bz2 marcuscom-ports-cb5ee1ee2cba0aaa9b8f40c3967718ecd91a8cb8.tar.lz marcuscom-ports-cb5ee1ee2cba0aaa9b8f40c3967718ecd91a8cb8.tar.xz marcuscom-ports-cb5ee1ee2cba0aaa9b8f40c3967718ecd91a8cb8.tar.zst marcuscom-ports-cb5ee1ee2cba0aaa9b8f40c3967718ecd91a8cb8.zip | |
Only append the vt number if the display is :0. This gets user switching
working for me.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11382 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/Makefile | 4 | ||||
| -rw-r--r-- | x11/gdm/files/patch-daemon-gdm-server.c | 19 |
2 files changed, 16 insertions, 7 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 0ce4da7b2..cdd89e8e5 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.130 2008/08/21 20:40:30 mezz Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.131 2008/08/25 16:51:39 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.23.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gdm/files/patch-daemon-gdm-server.c b/x11/gdm/files/patch-daemon-gdm-server.c index e57350568..079c62c66 100644 --- a/x11/gdm/files/patch-daemon-gdm-server.c +++ b/x11/gdm/files/patch-daemon-gdm-server.c @@ -1,5 +1,5 @@ ---- daemon/gdm-server.c.orig 2007-11-19 22:53:12.000000000 +0100 -+++ daemon/gdm-server.c 2007-12-25 11:56:07.000000000 +0100 +--- daemon/gdm-server.c.orig 2008-03-17 19:11:00.000000000 -0400 ++++ daemon/gdm-server.c 2008-08-25 16:11:10.000000000 -0400 @@ -44,6 +44,10 @@ #include "gdm-common.h" #include "gdm-signal-handler.h" @@ -11,7 +11,7 @@ #include "gdm-server.h" extern char **environ; -@@ -77,6 +81,7 @@ +@@ -77,6 +81,7 @@ struct GdmServerPrivate char *parent_display_name; char *parent_auth_file; char *chosen_hostname; @@ -19,7 +19,16 @@ guint child_watch_id; }; -@@ -663,7 +668,7 @@ +@@ -306,7 +311,7 @@ gdm_server_resolve_command_line (GdmServ + argv[len++] = g_strdup ("tcp"); + } + +- if (vtarg != NULL && ! gotvtarg) { ++ if (vtarg != NULL && ! gotvtarg && strncmp (server->priv->display_name, ":0", 2) == 0) { + argv[len++] = g_strdup (vtarg); + } + +@@ -673,7 +678,7 @@ gdm_server_start (GdmServer *server) gboolean res; /* fork X server process */ @@ -28,7 +37,7 @@ return res; } -@@ -890,12 +895,33 @@ +@@ -925,12 +930,33 @@ static void gdm_server_init (GdmServer *server) { |