Attachment 469789 Details for Bug 630052 – Build the discard_hash before saving/removing state files

[patch] Build the discard_hash before saving/removing state files

gnome-session-2.28.0-fix-discard-exec.patch (text/plain), 3.05 KB, created by Olivier Fourdan on 2010-12-20 15:30:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Fourdan

Created: 2010-12-20 15:30:13 UTC

Size: 3.05 KB

patch

obsolete

>diff -up gnome-session-2.28.0/gnome-session/gsm-session-save.c.discard-exec gnome-session-2.28.0/gnome-session/gsm-session-save.c
>--- gnome-session-2.28.0/gnome-session/gsm-session-save.c.discard-exec	2010-12-13 13:42:38.000000000 +0100
>+++ gnome-session-2.28.0/gnome-session/gsm-session-save.c	2010-12-20 16:28:31.000000000 +0100
>@@ -43,6 +43,47 @@ typedef struct {
> } SessionSaveData;
> 
> static gboolean
>+add_to_discard_hash (char            *id,
>+                     GObject         *object,
>+                     SessionSaveData *data)
>+{
>+        GsmClient  *client;
>+        GError     *local_error;
>+        GKeyFile   *keyfile;
>+        char       *discard_exec;
>+
>+
>+        client = GSM_CLIENT (object);
>+        local_error = NULL;
>+
>+        keyfile = gsm_client_save (client, &local_error);
>+
>+        if (keyfile == NULL || local_error) {
>+                goto out;
>+        }
>+
>+        discard_exec = g_key_file_get_string (keyfile,
>+                                              G_KEY_FILE_DESKTOP_GROUP,
>+                                              GSM_AUTOSTART_APP_DISCARD_KEY,
>+                                              NULL);
>+        if (discard_exec) {
>+                g_hash_table_insert (data->discard_hash,
>+                                     discard_exec, discard_exec);
>+        }
>+
>+out:
>+        if (keyfile != NULL) {
>+                g_key_file_free (keyfile);
>+        }
>+
>+        if (local_error) {
>+                g_error_free (local_error);
>+        }
>+
>+        return FALSE;
>+}
>+
>+static gboolean
> save_one_client (char            *id,
>                  GObject         *object,
>                  SessionSaveData *data)
>@@ -53,7 +94,6 @@ save_one_client (char            *id,
>         char       *filename = NULL;
>         char       *contents = NULL;
>         gsize       length = 0;
>-        char       *discard_exec;
>         GError     *local_error;
> 
>         client = GSM_CLIENT (object);
>@@ -86,15 +126,6 @@ save_one_client (char            *id,
>                 goto out;
>         }
> 
>-        discard_exec = g_key_file_get_string (keyfile,
>-                                              G_KEY_FILE_DESKTOP_GROUP,
>-                                              GSM_AUTOSTART_APP_DISCARD_KEY,
>-                                              NULL);
>-        if (discard_exec) {
>-                g_hash_table_insert (data->discard_hash,
>-                                     discard_exec, discard_exec);
>-        }
>-
>         g_debug ("GsmSessionSave: saved client %s to %s", id, filename);
> 
> out:
>@@ -158,6 +189,11 @@ gsm_session_save (GsmStore  *client_stor
>         data.dir = save_dir;
>         data.discard_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
>                                                    g_free, NULL);
>+        /* populate the old discard hash */
>+        gsm_store_foreach (client_store,
>+                           (GsmStoreFunc) add_to_discard_hash,
>+                           &data);
>+
>         /* remove the old saved session */
>         gsm_session_clear_saved_session (save_dir, data.discard_hash);
>         data.error = error;

Actions: View | Diff

Attachments on bug 630052: 469787 | 469789