summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2011-09-11 15:09:52 -0400
committerRyan Lortie <desrt@desrt.ca>2011-09-11 15:09:52 -0400
commit44d56d869d2236ef1d177bd1ab33d65ae23d7e2e (patch)
treee4e56f05c6238dc29af96a02cab6b3e1cd4b41eb /common
parent3ecf9aab99ff201ba66e7d7f6e79accbd6797660 (diff)
downloaddconf-44d56d869d2236ef1d177bd1ab33d65ae23d7e2e.tar.gz
Remove "service func" logic
This was required to support the case where the dconf client was unable to determine the cache directory for itself. Since we now use the XDG runtime directory, this is redundant.
Diffstat (limited to 'common')
-rw-r--r--common/dconf-shmdir.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/common/dconf-shmdir.c b/common/dconf-shmdir.c
index cb40e11..eed90e5 100644
--- a/common/dconf-shmdir.c
+++ b/common/dconf-shmdir.c
@@ -26,21 +26,10 @@ dconf_shmdir_from_environment (void)
{
gchar *result;
- result = g_strdup (g_getenv ("DCONF_SESSION_DIR"));
-
- if (result == NULL)
- {
- result = g_build_filename (g_get_user_runtime_dir (), "dconf", NULL);
-
- if (g_mkdir_with_parents (result, 0700) != 0)
- {
- g_free (result);
- result = NULL;
- }
- }
-
-
+ result = g_build_filename (g_get_user_runtime_dir (), "dconf", NULL);
+ if (!g_mkdir_with_parents (result, 0700) != 0)
+ g_critical ("unable to create '%s'; dconf will not work properly.", result);
return result;
}