gdm r5827 - in trunk: . common daemon

[mccann svn gnome org]

Author: mccann
Date: Wed Feb 20 21:31:34 2008
New Revision: 5827
URL: http://svn.gnome.org/viewvc/gdm?rev=5827&view=rev

Log:
2008-02-20  William Jon McCann  <jmccann redhat com>

	* common/gdm-settings-keys.h:
	* common/test-settings-client.c: (test_settings_client):
	* daemon/gdm-manager.c: (gdm_manager_class_init):
	* daemon/main.c: (main):
	Set XDMCP enabled/disabled from configuration settings.



Modified:
   trunk/ChangeLog
   trunk/common/gdm-settings-keys.h
   trunk/common/test-settings-client.c
   trunk/daemon/gdm-manager.c
   trunk/daemon/main.c

Modified: trunk/common/gdm-settings-keys.h
==============================================================================
--- trunk/common/gdm-settings-keys.h	(original)
+++ trunk/common/gdm-settings-keys.h	Wed Feb 20 21:31:34 2008
@@ -31,7 +31,7 @@
 #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
 #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
 
-#define GDM_KEY_XDMCP "xdmcp/Enable"
+#define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
 #define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
 #define GDM_KEY_MAX_SESSIONS "xdmcp/MaxSessions"
 #define GDM_KEY_MAX_WAIT "xdmcp/MaxWait"

Modified: trunk/common/test-settings-client.c
==============================================================================
--- trunk/common/test-settings-client.c	(original)
+++ trunk/common/test-settings-client.c	Wed Feb 20 21:31:34 2008
@@ -57,16 +57,16 @@
         g_debug ("Got res=%d %s=%s", res, GDM_KEY_WILLING, strval);
         g_free (strval);
 
-        res = gdm_settings_client_get_boolean (GDM_KEY_XDMCP, &boolval);
-        g_debug ("Got res=%d %s=%s", res, GDM_KEY_XDMCP, boolval ? "true" : "false");
+        res = gdm_settings_client_get_boolean (GDM_KEY_XDMCP_ENABLE, &boolval);
+        g_debug ("Got res=%d %s=%s", res, GDM_KEY_XDMCP_ENABLE, boolval ? "true" : "false");
 
         g_debug ("Adding notify for all keys");
         gdm_settings_client_notify_add ("/", notify_cb, NULL, NULL);
 
-        g_debug ("Setting boolean key %s to %s", GDM_KEY_XDMCP, !boolval ? "true" : "false");
-        gdm_settings_client_set_boolean (GDM_KEY_XDMCP, !boolval);
-        g_debug ("Setting boolean key %s to %s", GDM_KEY_XDMCP, boolval ? "true" : "false");
-        gdm_settings_client_set_boolean (GDM_KEY_XDMCP, boolval);
+        g_debug ("Setting boolean key %s to %s", GDM_KEY_XDMCP_ENABLE, !boolval ? "true" : "false");
+        gdm_settings_client_set_boolean (GDM_KEY_XDMCP_ENABLE, !boolval);
+        g_debug ("Setting boolean key %s to %s", GDM_KEY_XDMCP_ENABLE, boolval ? "true" : "false");
+        gdm_settings_client_set_boolean (GDM_KEY_XDMCP_ENABLE, boolval);
 
         return FALSE;
 }

Modified: trunk/daemon/gdm-manager.c
==============================================================================
--- trunk/daemon/gdm-manager.c	(original)
+++ trunk/daemon/gdm-manager.c	Wed Feb 20 21:31:34 2008
@@ -370,7 +370,7 @@
                                          g_param_spec_boolean ("xdmcp-enabled",
                                                                NULL,
                                                                NULL,
-                                                               TRUE,
+                                                               FALSE,
                                                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
         g_type_class_add_private (klass, sizeof (GdmManagerPrivate));

Modified: trunk/daemon/main.c
==============================================================================
--- trunk/daemon/main.c	(original)
+++ trunk/daemon/main.c	Wed Feb 20 21:31:34 2008
@@ -509,6 +509,7 @@
         int                 ret;
         int                 i;
         gboolean            res;
+        gboolean            xdmcp_enabled;
         GdmSignalHandler   *signal_handler;
         static char        *config_file      = NULL;
         static gboolean     debug            = FALSE;
@@ -630,8 +631,9 @@
                 goto out;
         }
 
-        /* FIXME: pull from settings */
-        gdm_manager_set_xdmcp_enabled (manager, TRUE);
+        xdmcp_enabled = FALSE;
+        gdm_settings_direct_get_boolean (GDM_KEY_XDMCP_ENABLE, &xdmcp_enabled);
+        gdm_manager_set_xdmcp_enabled (manager, xdmcp_enabled);
 
         g_signal_connect (bus_proxy,
                           "destroy",