← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gconf/quantal

« back to all changes in this revision

Viewing changes to gconf/gconf-internals.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2012-03-08 21:38:45 UTC
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: package-import@ubuntu.com-20120308213845-6nny15k78pmd6nxo
Tags: upstream-3.2.4
Import upstream version 3.2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
gconf/gconf-internals.c
2796
2796
      const char *tmpdir;
2797
2797
 
2798
2798
      subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL);
2799
 
      
2800
 
      if (g_getenv ("GCONF_TMPDIR")) {
2801
 
        tmpdir = g_getenv ("GCONF_TMPDIR");
2802
 
      } else {
2803
 
        tmpdir = g_get_tmp_dir ();
2804
 
      }
2805
 
      
 
2799
 
 
2800
      if (g_getenv ("GCONF_TMPDIR"))
 
2801
        tmpdir = g_getenv ("GCONF_TMPDIR");
 
2802
      else if (g_getenv ("XDG_RUNTIME_DIR"))
 
2803
        {
 
2804
          g_free (subdir);
 
2805
          subdir = g_strdup ("gconfd");
 
2806
          tmpdir = g_getenv ("XDG_RUNTIME_DIR");
 
2807
        }
 
2808
      else
 
2809
        tmpdir = g_get_tmp_dir ();
 
2810
 
2806
2811
      s = g_build_filename (tmpdir, subdir, NULL);
2807
2812
 
2808
2813
      g_free (subdir);