gdm r5880 - in trunk: . daemon

[halfline svn gnome org]

Author: halfline
Date: Tue Feb 26 21:13:59 2008
New Revision: 5880
URL: http://svn.gnome.org/viewvc/gdm?rev=5880&view=rev

Log:
2008-02-26  Ray Strode  <rstrode redhat com>

	* daemon/gdm-session-worker.c: (_save_user_settings),
	(gdm_session_worker_start_user_session):
	Save out user settings to ~/.dmrc before starting the
	session


Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-session-worker.c

Modified: trunk/daemon/gdm-session-worker.c
==============================================================================
--- trunk/daemon/gdm-session-worker.c	(original)
+++ trunk/daemon/gdm-session-worker.c	Tue Feb 26 21:13:59 2008
@@ -1435,6 +1435,25 @@
         return fd;
 }
 
+static void
+_save_user_settings (GdmSessionWorker *worker,
+                     const char       *home_dir)
+{
+        GError *error;
+
+        if (!gdm_session_settings_is_loaded (worker->priv->user_settings)) {
+                return;
+        }
+
+        error = NULL;
+        if (!gdm_session_settings_save (worker->priv->user_settings,
+                                        home_dir, &error)) {
+                g_warning ("could not save session and language settings: %s",
+                           error->message);
+                g_error_free (error);
+        }
+}
+
 static gboolean
 gdm_session_worker_start_user_session (GdmSessionWorker  *worker,
                                        GError           **error)
@@ -1497,6 +1516,8 @@
                 dup2 (fd, STDERR_FILENO);
                 close (fd);
 
+                _save_user_settings (worker, home_dir);
+
                 gdm_session_execute (worker->priv->arguments[0],
                                      worker->priv->arguments,
                                      environment,