Attachment 706079 Details for Bug 795920 – Simple hack to always use $HOME/.dmrc

[patch] Simple hack to always use $HOME/.dmrc

gdm.patch (text/plain), 1.71 KB, created by James Pearson on 2013-03-06 15:47:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Pearson

Created: 2013-03-06 15:47:57 UTC

Size: 1.71 KB

patch

obsolete

>--- ./daemon/gdm-session-settings.c.mpc	2010-06-16 17:32:38.000000000 +0100
>+++ ./daemon/gdm-session-settings.c	2013-03-06 14:04:52.468994112 +0000
>@@ -277,12 +277,17 @@ gdm_session_settings_load (GdmSessionSet
>         char     *language_name;
>         char     *layout_name;
>         char     *filename;
>+        struct passwd *passwd_entry;
> 
>         g_return_val_if_fail (settings != NULL, FALSE);
>         g_return_val_if_fail (username != NULL, FALSE);
>         g_return_val_if_fail (!gdm_session_settings_is_loaded (settings), FALSE);
> 
>-        filename = g_build_filename (GDM_CACHE_DIR, username, "dmrc", NULL);
>+        gdm_get_pwent_for_name (username, &passwd_entry);
>+        if (passwd_entry == NULL)
>+               return FALSE;
>+        
>+        filename = g_build_filename (passwd_entry->pw_dir, ".dmrc", NULL);
> 
>         is_loaded = FALSE;
>         key_file = g_key_file_new ();
>--- ./daemon/gdm-session-worker.c.mpc	2013-03-06 14:09:07.151803805 +0000
>+++ ./daemon/gdm-session-worker.c	2013-03-06 14:10:43.718990778 +0000
>@@ -1090,7 +1090,7 @@ gdm_session_worker_cache_userfiles (GdmS
>                 return;
> 
>         cachedir = gdm_session_worker_create_cachedir (worker);
>-
>+#if 0
>         g_debug ("Copying user dmrc file to cache");
>         cachefile = g_build_filename (cachedir, "dmrc", NULL);
>         userfile = g_build_filename (passwd_entry->pw_dir, ".dmrc", NULL);
>@@ -1098,7 +1098,7 @@ gdm_session_worker_cache_userfiles (GdmS
>         gdm_cache_copy_file (worker, userfile, cachefile);
>         g_free (cachefile);
>         g_free (userfile);
>-
>+#endif
>         g_debug ("Copying user face file to cache");
>         cachefile = g_build_filename (cachedir,
>                                           "face",

Actions: View | Diff

Attachments on bug 795920: 706079