diff -up gnome-session-2.29.92/gnome-session/gsm-session-save.c.fix-ensure-dir gnome-session-2.29.92/gnome-session/gsm-session-save.c
--- gnome-session-2.29.92/gnome-session/gsm-session-save.c.fix-ensure-dir	2010-03-17 10:29:39.620659505 -0400
+++ gnome-session-2.29.92/gnome-session/gsm-session-save.c	2010-03-17 10:31:02.025690194 -0400
@@ -118,7 +118,6 @@ gsm_session_save (GsmStore  *client_stor
                   GError   **error)
 {
         const char      *save_dir;
-        char            *tmp_dir;
         SessionSaveData  data;
 
         g_debug ("GsmSessionSave: Saving session");
@@ -129,15 +128,10 @@ gsm_session_save (GsmStore  *client_stor
                 return;
         }
 
-        tmp_dir = gsm_util_get_empty_tmp_session_dir ();
-        if (tmp_dir == NULL) {
-                g_warning ("GsmSessionSave: cannot create new saved session directory");
-                return;
-        }
 
-        /* save the session in a temp directory, and remember the discard
-         * commands */
-        data.dir = tmp_dir;
+        data.dir = save_dir;
         data.discard_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                    g_free, NULL);
+        /* remove the old saved session */
+        gsm_session_clear_saved_session (save_dir, data.discard_hash);
         data.error = error;
@@ -146,24 +140,7 @@ gsm_session_save (GsmStore  *client_stor
                            (GsmStoreFunc) save_one_client,
                            &data);
 
-        if (!*error) {
-                /* remove the old saved session */
-                gsm_session_clear_saved_session (save_dir, data.discard_hash);
-
-                /* rename the temp session dir */
-                if (g_file_test (save_dir, G_FILE_TEST_IS_DIR))
-                        g_rmdir (save_dir);
-                g_rename (tmp_dir, save_dir);
-        } else {
-                g_warning ("GsmSessionSave: error saving session: %s", (*error)->message);
-                /* FIXME: we should create a hash table filled with the discard
-                 * commands that are in desktop files from save_dir. */
-                gsm_session_clear_saved_session (tmp_dir, NULL);
-                g_rmdir (tmp_dir);
-        }
-
         g_hash_table_destroy (data.discard_hash);
-        g_free (tmp_dir);
 }
 
 static gboolean
diff -up gnome-session-2.29.92/gnome-session/gsm-util.c.fix-ensure-dir gnome-session-2.29.92/gnome-session/gsm-util.c
--- gnome-session-2.29.92/gnome-session/gsm-util.c.fix-ensure-dir	2010-03-17 10:21:03.648893739 -0400
+++ gnome-session-2.29.92/gnome-session/gsm-util.c	2010-03-17 10:21:03.651851160 -0400
@@ -126,15 +126,9 @@ gsm_util_find_desktop_file_for_app_name 
 static gboolean
 ensure_dir_exists (const char *dir)
 {
-        if (g_file_test (dir, G_FILE_TEST_IS_DIR))
-                return TRUE;
-
         if (g_mkdir_with_parents (dir, 0755) == 0)
                 return TRUE;
 
-        if (errno == EEXIST)
-                return g_file_test (dir, G_FILE_TEST_IS_DIR);
-
         g_warning ("GsmSessionSave: Failed to create directory %s: %s", dir, strerror (errno));
 
         return FALSE;
