r24313 - in /desktop/unstable/gdm3/debian: changelog patches/22_noconsole.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat May 8 12:40:34 UTC 2010
Author: joss
Date: Sat May 8 12:40:32 2010
New Revision: 24313
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24313
Log:
22_noconsole.patch: patch from Patrick Monnerat to allow GDM to work
as a standalone XDMCP server.
Added:
desktop/unstable/gdm3/debian/patches/22_noconsole.patch
Modified:
desktop/unstable/gdm3/debian/changelog
desktop/unstable/gdm3/debian/patches/series
Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=24313&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sat May 8 12:40:32 2010
@@ -17,6 +17,8 @@
* 21_schemas_usr.patch: new patch. Move gdm.schemas to /usr, it should
certainly not be editable.
* 90_relibtoolize.patch: refreshed accordingly.
+ * 22_noconsole.patch: patch from Patrick Monnerat to allow GDM to work
+ as a standalone XDMCP server.
-- Josselin Mouette <joss at debian.org> Sat, 08 May 2010 10:24:52 +0200
Added: desktop/unstable/gdm3/debian/patches/22_noconsole.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/22_noconsole.patch?rev=24313&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/22_noconsole.patch (added)
+++ desktop/unstable/gdm3/debian/patches/22_noconsole.patch [utf-8] Sat May 8 12:40:32 2010
@@ -1,0 +1,135 @@
+GNOME #567522
+
+Index: gdm-2.30.2/common/gdm-settings-keys.h
+===================================================================
+--- gdm-2.30.2.orig/common/gdm-settings-keys.h 2010-05-08 10:32:52.000000000 +0200
++++ gdm-2.30.2/common/gdm-settings-keys.h 2010-05-08 14:38:59.321611630 +0200
+@@ -32,6 +32,7 @@ G_BEGIN_DECLS
+ #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
+ #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
+ #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
++#define GDM_KEY_NO_CONSOLE "daemon/NoConsole"
+ #define GDM_KEY_FIRST_VT "daemon/FirstVT"
+
+ #define GDM_KEY_DEBUG "debug/Enable"
+Index: gdm-2.30.2/daemon/gdm-manager.c
+===================================================================
+--- gdm-2.30.2.orig/daemon/gdm-manager.c 2010-05-08 14:30:39.000000000 +0200
++++ gdm-2.30.2/daemon/gdm-manager.c 2010-05-08 14:38:13.725613897 +0200
+@@ -71,7 +71,8 @@ struct GdmManagerPrivate
+
+ enum {
+ PROP_0,
+- PROP_XDMCP_ENABLED
++ PROP_XDMCP_ENABLED,
++ PROP_NO_CONSOLE
+ };
+
+ enum {
+@@ -161,7 +162,7 @@ gdm_manager_start (GdmManager *manager)
+ {
+ g_debug ("GdmManager: GDM starting to manage displays");
+
+- if (! manager->priv->wait_for_go) {
++ if (!manager->priv->no_console && ! manager->priv->wait_for_go) {
+ gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
+ }
+
+@@ -187,7 +188,8 @@ gdm_manager_set_wait_for_go (GdmManager
+
+ if (! wait_for_go) {
+ /* we got a go */
+- gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
++ if (!manager->priv->no_console)
++ gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
+
+ #ifdef HAVE_LIBXDMCP
+ if (manager->priv->xdmcp_enabled && manager->priv->xdmcp_factory != NULL) {
+@@ -313,6 +315,15 @@ gdm_manager_set_xdmcp_enabled (GdmManage
+
+ }
+
++void
++gdm_manager_set_no_console (GdmManager *manager,
++ gboolean no_console)
++{
++ g_return_if_fail (GDM_IS_MANAGER (manager));
++
++ manager->priv->no_console = no_console;
++}
++
+ static void
+ gdm_manager_set_property (GObject *object,
+ guint prop_id,
+@@ -327,6 +338,9 @@ gdm_manager_set_property (GObject *
+ case PROP_XDMCP_ENABLED:
+ gdm_manager_set_xdmcp_enabled (self, g_value_get_boolean (value));
+ break;
++ case PROP_NO_CONSOLE:
++ gdm_manager_set_no_console (self, g_value_get_boolean (value));
++ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+@@ -347,6 +361,9 @@ gdm_manager_get_property (GObject *ob
+ case PROP_XDMCP_ENABLED:
+ g_value_set_boolean (value, self->priv->xdmcp_enabled);
+ break;
++ case PROP_NO_CONSOLE:
++ g_value_set_boolean (value, self->priv->no_console);
++ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+Index: gdm-2.30.2/daemon/gdm-manager.h
+===================================================================
+--- gdm-2.30.2.orig/daemon/gdm-manager.h 2010-03-17 22:27:16.000000000 +0100
++++ gdm-2.30.2/daemon/gdm-manager.h 2010-05-08 14:38:13.729611542 +0200
+@@ -69,6 +69,8 @@ void gdm_manager_set_wait
+
+ void gdm_manager_set_xdmcp_enabled (GdmManager *manager,
+ gboolean enabled);
++void gdm_manager_set_no_console (GdmManager *manager,
++ gboolean no_console);
+ gboolean gdm_manager_get_displays (GdmManager *manager,
+ GPtrArray **displays,
+ GError **error);
+Index: gdm-2.30.2/daemon/main.c
+===================================================================
+--- gdm-2.30.2.orig/daemon/main.c 2010-05-08 14:30:41.000000000 +0200
++++ gdm-2.30.2/daemon/main.c 2010-05-08 14:38:13.729611542 +0200
+@@ -525,6 +525,7 @@ main (int argc,
+ int ret;
+ gboolean res;
+ gboolean xdmcp_enabled;
++ gboolean no_console;
+ GdmSignalHandler *signal_handler;
+ static gboolean do_timed_exit = FALSE;
+ static gboolean print_version = FALSE;
+@@ -624,6 +625,10 @@ main (int argc,
+ goto out;
+ }
+
++ no_console = FALSE;
++ gdm_settings_direct_get_boolean (GDM_KEY_NO_CONSOLE, &no_console);
++ gdm_manager_set_no_console (manager, no_console);
++
+ xdmcp_enabled = FALSE;
+ gdm_settings_direct_get_boolean (GDM_KEY_XDMCP_ENABLE, &xdmcp_enabled);
+ gdm_manager_set_xdmcp_enabled (manager, xdmcp_enabled);
+Index: gdm-2.30.2/data/gdm.schemas.in.in
+===================================================================
+--- gdm-2.30.2.orig/data/gdm.schemas.in.in 2010-05-08 10:32:52.000000000 +0200
++++ gdm-2.30.2/data/gdm.schemas.in.in 2010-05-08 14:38:13.729611542 +0200
+@@ -52,6 +52,11 @@
+ <signature>i</signature>
+ <default>7</default>
+ </schema>
++ <schema>
++ <key>daemon/NoConsole</key>
++ <signature>b</signature>
++ <default>false</default>
++ </schema>
+
+ <schema>
+ <key>debug/Enable</key>
Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=24313&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sat May 8 12:40:32 2010
@@ -21,4 +21,5 @@
19_xserver_options.patch
20_endsession_respawn.patch
21_schemas_usr.patch
+22_noconsole.patch
90_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list