r25524 - in /desktop/unstable/gdm3/debian: changelog patches/11_xephyr_nested.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Nov 7 09:35:43 UTC 2010
Author: joss
Date: Sun Nov 7 09:35:40 2010
New Revision: 25524
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25524
Log:
11_xephyr_nested.patch: don’t switch VTs from nested displays. It’s
confusing and prevents using them to start sessions for existing
users.
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/patches/11_xephyr_nested.patch
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=25524&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sun Nov 7 09:35:40 2010
@@ -1,3 +1,11 @@
+gdm3 (2.30.5-6) UNRELEASED; urgency=low
+
+ * 11_xephyr_nested.patch: don’t switch VTs from nested displays. It’s
+ confusing and prevents using them to start sessions for existing
+ users.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 07 Nov 2010 10:23:12 +0100
+
gdm3 (2.30.5-5) unstable; urgency=low
* 27_orca_braille.patch: patch from Samuel Thibault to enable braille
Modified: desktop/unstable/gdm3/debian/patches/11_xephyr_nested.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/11_xephyr_nested.patch?rev=25524&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/11_xephyr_nested.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/11_xephyr_nested.patch [utf-8] Sun Nov 7 09:35:40 2010
@@ -2,7 +2,7 @@
Index: gdm-2.30.5/daemon/gdm-display.c
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-display.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-display.c 2010-10-06 00:15:03.773257313 +0200
++++ gdm-2.30.5/daemon/gdm-display.c 2010-11-07 10:10:53.517838157 +0100
@@ -52,6 +52,8 @@ struct GdmDisplayPrivate
{
char *id;
@@ -288,7 +288,7 @@
Index: gdm-2.30.5/daemon/gdm-display.h
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-display.h 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-display.h 2010-10-06 00:15:03.757260379 +0200
++++ gdm-2.30.5/daemon/gdm-display.h 2010-11-07 10:10:53.521834336 +0100
@@ -102,6 +102,9 @@ gboolean gdm_display_unmanage
gboolean gdm_display_get_id (GdmDisplay *display,
char **id,
@@ -323,7 +323,7 @@
Index: gdm-2.30.5/daemon/gdm-local-display-factory.c
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-local-display-factory.c 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-local-display-factory.c 2010-10-06 00:15:14.633762034 +0200
++++ gdm-2.30.5/daemon/gdm-local-display-factory.c 2010-11-07 10:10:53.521834336 +0100
@@ -22,11 +22,15 @@
#include <stdlib.h>
@@ -476,7 +476,7 @@
Index: gdm-2.30.5/daemon/gdm-local-display-factory.h
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-local-display-factory.h 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-local-display-factory.h 2010-10-06 00:14:25.029759817 +0200
++++ gdm-2.30.5/daemon/gdm-local-display-factory.h 2010-11-07 10:10:53.521834336 +0100
@@ -65,6 +65,10 @@ gboolean gdm_local_dis
char **id,
GError **error);
@@ -491,7 +491,7 @@
Index: gdm-2.30.5/daemon/gdm-local-display-factory.xml
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-local-display-factory.xml 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-local-display-factory.xml 2010-10-06 00:14:25.029759817 +0200
++++ gdm-2.30.5/daemon/gdm-local-display-factory.xml 2010-11-07 10:10:53.521834336 +0100
@@ -9,5 +9,10 @@
<method name="CreateTransientDisplay">
<arg name="id" direction="out" type="o"/>
@@ -505,8 +505,8 @@
</node>
Index: gdm-2.30.5/daemon/gdm-simple-slave.c
===================================================================
---- gdm-2.30.5.orig/daemon/gdm-simple-slave.c 2010-10-06 00:14:24.957760156 +0200
-+++ gdm-2.30.5/daemon/gdm-simple-slave.c 2010-10-06 00:15:04.041259406 +0200
+--- gdm-2.30.5.orig/daemon/gdm-simple-slave.c 2010-11-07 10:10:53.442335610 +0100
++++ gdm-2.30.5/daemon/gdm-simple-slave.c 2010-11-07 10:10:53.521834336 +0100
@@ -916,6 +916,7 @@ start_greeter (GdmSimpleSlave *slave)
char *display_name;
char *display_device;
@@ -591,8 +591,8 @@
G_CALLBACK (on_server_exited),
Index: gdm-2.30.5/daemon/gdm-slave.c
===================================================================
---- gdm-2.30.5.orig/daemon/gdm-slave.c 2010-10-06 00:14:24.993760476 +0200
-+++ gdm-2.30.5/daemon/gdm-slave.c 2010-10-06 00:15:03.709261753 +0200
+--- gdm-2.30.5.orig/daemon/gdm-slave.c 2010-11-07 10:10:53.478334459 +0100
++++ gdm-2.30.5/daemon/gdm-slave.c 2010-11-07 10:22:22.073832697 +0100
@@ -81,32 +81,42 @@ struct GdmSlavePrivate
/* cached display values */
@@ -840,7 +840,19 @@
"IsLocal",
&error,
G_TYPE_INVALID,
-@@ -1353,6 +1511,14 @@ _gdm_slave_set_display_id (GdmSlave *s
+@@ -1314,6 +1472,11 @@ gdm_slave_switch_to_user_session (GdmSla
+ gboolean ret;
+ char *ssid_to_activate;
+
++ if (slave->priv->display_is_nested) {
++ /* Never switch from nested displays */
++ return FALSE;
++ }
++
+ ret = FALSE;
+
+ ssid_to_activate = gdm_slave_get_primary_session_id_for_user (slave, username);
+@@ -1353,6 +1516,14 @@ _gdm_slave_set_display_id (GdmSlave *s
}
static void
@@ -855,7 +867,7 @@
_gdm_slave_set_display_name (GdmSlave *slave,
const char *name)
{
-@@ -1399,6 +1565,37 @@ _gdm_slave_set_display_is_local (GdmSlav
+@@ -1399,6 +1570,37 @@ _gdm_slave_set_display_is_local (GdmSlav
}
static void
@@ -893,7 +905,7 @@
gdm_slave_set_property (GObject *object,
guint prop_id,
const GValue *value,
-@@ -1412,6 +1609,9 @@ gdm_slave_set_property (GObject *ob
+@@ -1412,6 +1614,9 @@ gdm_slave_set_property (GObject *ob
case PROP_DISPLAY_ID:
_gdm_slave_set_display_id (self, g_value_get_string (value));
break;
@@ -903,7 +915,7 @@
case PROP_DISPLAY_NAME:
_gdm_slave_set_display_name (self, g_value_get_string (value));
break;
-@@ -1430,6 +1630,18 @@ gdm_slave_set_property (GObject *ob
+@@ -1430,6 +1635,18 @@ gdm_slave_set_property (GObject *ob
case PROP_DISPLAY_IS_LOCAL:
_gdm_slave_set_display_is_local (self, g_value_get_boolean (value));
break;
@@ -922,7 +934,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -1450,6 +1662,9 @@ gdm_slave_get_property (GObject *obje
+@@ -1450,6 +1667,9 @@ gdm_slave_get_property (GObject *obje
case PROP_DISPLAY_ID:
g_value_set_string (value, self->priv->display_id);
break;
@@ -932,7 +944,7 @@
case PROP_DISPLAY_NAME:
g_value_set_string (value, self->priv->display_name);
break;
-@@ -1468,6 +1683,18 @@ gdm_slave_get_property (GObject *obje
+@@ -1468,6 +1688,18 @@ gdm_slave_get_property (GObject *obje
case PROP_DISPLAY_IS_LOCAL:
g_value_set_boolean (value, self->priv->display_is_local);
break;
@@ -951,7 +963,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -1549,6 +1776,13 @@ gdm_slave_class_init (GdmSlaveClass *kla
+@@ -1549,6 +1781,13 @@ gdm_slave_class_init (GdmSlaveClass *kla
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
@@ -965,7 +977,7 @@
PROP_DISPLAY_NAME,
g_param_spec_string ("display-name",
"display name",
-@@ -1592,6 +1826,34 @@ gdm_slave_class_init (GdmSlaveClass *kla
+@@ -1592,6 +1831,34 @@ gdm_slave_class_init (GdmSlaveClass *kla
"display is local",
TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
@@ -1000,7 +1012,7 @@
signals [STOPPED] =
g_signal_new ("stopped",
-@@ -1637,7 +1899,7 @@ gdm_slave_finalize (GObject *object)
+@@ -1637,7 +1904,7 @@ gdm_slave_finalize (GObject *object)
g_free (slave->priv->display_seat_id);
g_free (slave->priv->display_x11_authority_file);
g_free (slave->priv->parent_display_name);
@@ -1012,7 +1024,7 @@
Index: gdm-2.30.5/daemon/gdm-display.xml
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-display.xml 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-display.xml 2010-10-06 00:15:03.741256600 +0200
++++ gdm-2.30.5/daemon/gdm-display.xml 2010-11-07 10:10:53.525835404 +0100
@@ -4,6 +4,9 @@
<method name="GetId">
<arg name="id" direction="out" type="o"/>
@@ -1047,7 +1059,7 @@
Index: gdm-2.30.5/data/gdm.conf.in
===================================================================
--- gdm-2.30.5.orig/data/gdm.conf.in 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/data/gdm.conf.in 2010-10-06 00:15:04.805260335 +0200
++++ gdm-2.30.5/data/gdm.conf.in 2010-11-07 10:10:53.525835404 +0100
@@ -62,10 +62,16 @@
<allow send_destination="org.gnome.DisplayManager"
send_interface="org.gnome.DisplayManager.Display"
@@ -1067,8 +1079,8 @@
send_interface="org.gnome.DisplayManager.Manager"
Index: gdm-2.30.5/daemon/gdm-server.c
===================================================================
---- gdm-2.30.5.orig/daemon/gdm-server.c 2010-10-06 00:14:24.853762224 +0200
-+++ gdm-2.30.5/daemon/gdm-server.c 2010-10-06 00:15:03.929259828 +0200
+--- gdm-2.30.5.orig/daemon/gdm-server.c 2010-11-07 10:10:53.334336124 +0100
++++ gdm-2.30.5/daemon/gdm-server.c 2010-11-07 10:10:53.525835404 +0100
@@ -70,6 +70,7 @@ extern char **environ;
struct GdmServerPrivate
{
@@ -1305,7 +1317,7 @@
Index: gdm-2.30.5/utils/gdmflexiserver.c
===================================================================
--- gdm-2.30.5.orig/utils/gdmflexiserver.c 2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/utils/gdmflexiserver.c 2010-10-06 00:14:25.037757552 +0200
++++ gdm-2.30.5/utils/gdmflexiserver.c 2010-11-07 10:10:53.525835404 +0100
@@ -34,6 +34,9 @@
#include <dbus/dbus-glib-lowlevel.h>
@@ -1579,7 +1591,7 @@
Index: gdm-2.30.5/data/Init.in
===================================================================
--- gdm-2.30.5.orig/data/Init.in 2010-08-11 16:19:44.000000000 +0200
-+++ gdm-2.30.5/data/Init.in 2010-10-06 00:14:25.037757552 +0200
++++ gdm-2.30.5/data/Init.in 2010-11-07 10:10:53.525835404 +0100
@@ -66,22 +66,11 @@ if [ "x$SETXKBMAP" != "x" ] ; then
# What this does is move the xkb configuration from the GDM_PARENT_DISPLAY
# FIXME: This should be done in code. Or there must be an easier way ...
@@ -1610,7 +1622,7 @@
Index: gdm-2.30.5/daemon/gdm-factory-slave.c
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-factory-slave.c 2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-factory-slave.c 2010-10-06 00:14:25.037757552 +0200
++++ gdm-2.30.5/daemon/gdm-factory-slave.c 2010-11-07 10:10:53.529834516 +0100
@@ -558,6 +558,7 @@ run_greeter (GdmFactorySlave *slave)
slave->priv->greeter = gdm_greeter_session_new (display_name,
display_device,
@@ -1622,7 +1634,7 @@
Index: gdm-2.30.5/daemon/gdm-greeter-session.c
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-greeter-session.c 2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-greeter-session.c 2010-10-06 00:14:25.037757552 +0200
++++ gdm-2.30.5/daemon/gdm-greeter-session.c 2010-11-07 10:10:53.529834516 +0100
@@ -142,6 +142,7 @@ GdmGreeterSession *
gdm_greeter_session_new (const char *display_name,
const char *display_device,
@@ -1642,7 +1654,7 @@
Index: gdm-2.30.5/daemon/gdm-greeter-session.h
===================================================================
--- gdm-2.30.5.orig/daemon/gdm-greeter-session.h 2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-greeter-session.h 2010-10-06 00:14:25.037757552 +0200
++++ gdm-2.30.5/daemon/gdm-greeter-session.h 2010-11-07 10:10:53.529834516 +0100
@@ -52,6 +52,7 @@ GType gdm_greeter_sessio
GdmGreeterSession * gdm_greeter_session_new (const char *display_name,
const char *display_device,
@@ -1653,8 +1665,8 @@
G_END_DECLS
Index: gdm-2.30.5/daemon/gdm-welcome-session.c
===================================================================
---- gdm-2.30.5.orig/daemon/gdm-welcome-session.c 2010-10-06 00:14:24.785761677 +0200
-+++ gdm-2.30.5/daemon/gdm-welcome-session.c 2010-10-06 00:14:25.041757641 +0200
+--- gdm-2.30.5.orig/daemon/gdm-welcome-session.c 2010-11-07 10:10:53.250339141 +0100
++++ gdm-2.30.5/daemon/gdm-welcome-session.c 2010-11-07 10:10:53.529834516 +0100
@@ -70,6 +70,7 @@ struct GdmWelcomeSessionPrivate
char *x11_display_hostname;
char *x11_authority_file;
@@ -1740,7 +1752,7 @@
Index: gdm-2.30.5/gui/simple-greeter/gdm-greeter-panel.c
===================================================================
--- gdm-2.30.5.orig/gui/simple-greeter/gdm-greeter-panel.c 2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/gui/simple-greeter/gdm-greeter-panel.c 2010-10-06 00:15:02.989258862 +0200
++++ gdm-2.30.5/gui/simple-greeter/gdm-greeter-panel.c 2010-11-07 10:10:53.529834516 +0100
@@ -64,6 +64,10 @@
#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement"
#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
More information about the pkg-gnome-commits
mailing list