gdm r6769 - in trunk: . daemon

[bcameron svn gnome org]

Author: bcameron
Date: Sat Mar 14 01:06:00 2009
New Revision: 6769
URL: http://svn.gnome.org/viewvc/gdm?rev=6769&view=rev

Log:
2009-03-13  Brian Cameron  <brian cameron sun com>

        * daemon/xdmcp-chooser-slave-main.c, daemon/simple-slave-main.c:
          Call gdm_settings_direct_init.  Otherwise when these programs try
          to read the xdmcp/PingIntervalSeconds configuration value, they
          fail to load it.


Modified:
   trunk/ChangeLog
   trunk/daemon/simple-slave-main.c
   trunk/daemon/xdmcp-chooser-slave-main.c

Modified: trunk/daemon/simple-slave-main.c
==============================================================================
--- trunk/daemon/simple-slave-main.c	(original)
+++ trunk/daemon/simple-slave-main.c	Sat Mar 14 01:06:00 2009
@@ -43,10 +43,13 @@
 #include "gdm-log.h"
 #include "gdm-common.h"
 #include "gdm-simple-slave.h"
+#include "gdm-settings.h"
+#include "gdm-settings-direct.h"
 
 #include "gdm-settings-client.h"
 
-static int gdm_return_code = 0;
+static GdmSettings     *settings        = NULL;
+static int              gdm_return_code = 0;
 
 static DBusGConnection *
 get_system_bus (void)
@@ -202,6 +205,17 @@
 
         gdm_log_init ();
 
+        settings = gdm_settings_new ();
+        if (settings == NULL) {
+                g_warning ("Unable to initialize settings");
+                goto out;
+        }
+
+        if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
+                g_warning ("Unable to initialize settings");
+                goto out;
+        }
+
         gdm_log_set_debug (is_debug_set (debug));
 
         if (display_id == NULL) {

Modified: trunk/daemon/xdmcp-chooser-slave-main.c
==============================================================================
--- trunk/daemon/xdmcp-chooser-slave-main.c	(original)
+++ trunk/daemon/xdmcp-chooser-slave-main.c	Sat Mar 14 01:06:00 2009
@@ -43,8 +43,11 @@
 #include "gdm-log.h"
 #include "gdm-common.h"
 #include "gdm-xdmcp-chooser-slave.h"
+#include "gdm-settings.h"
+#include "gdm-settings-direct.h"
 
-static int gdm_return_code = 0;
+static GdmSettings     *settings        = NULL;
+static int              gdm_return_code = 0;
 
 static DBusGConnection *
 get_system_bus (void)
@@ -199,6 +202,17 @@
 
         gdm_log_init ();
 
+        settings = gdm_settings_new ();
+        if (settings == NULL) {
+                g_warning ("Unable to initialize settings");
+                goto out;
+        }
+
+        if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) {
+                g_warning ("Unable to initialize settings");
+                goto out;
+        }
+
         gdm_log_set_debug (is_debug_set (debug));
 
         if (display_id == NULL) {