[Gnucash-changes] r12025 - gnucash/trunk - Use the g_get_home_dir() function instead of getenv("HOME"). The

David Hampton hampton at cvs.gnucash.org
Wed Nov 23 17:43:32 EST 2005


Author: hampton
Date: 2005-11-23 17:43:32 -0500 (Wed, 23 Nov 2005)
New Revision: 12025
Trac: http://svn.gnucash.org/trac/changeset/12025

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/lib/libqof/qof/guid.c
   gnucash/trunk/src/app-utils/gnc-ui-util.c
   gnucash/trunk/src/engine/test/test-resolve-file-path.c
   gnucash/trunk/src/gnome-utils/druid-gconf-setup.c
Log:
Use the g_get_home_dir() function instead of getenv("HOME").  The
former tries multiple places to get the path to the users home
directory.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-11-23 22:41:21 UTC (rev 12024)
+++ gnucash/trunk/ChangeLog	2005-11-23 22:43:32 UTC (rev 12025)
@@ -1,5 +1,12 @@
 2005-11-23  David Hampton  <hampton at employees.org>
 
+	* src/gnome-utils/druid-gconf-setup.c:
+	* src/engine/test/test-resolve-file-path.c:
+	* src/app-utils/gnc-ui-util.c:
+	* lib/libqof/qof/guid.c: Use the g_get_home_dir() function instead
+	of getenv("HOME").  The former tries multiple places to get the
+	path to the users home directory.
+	
 	* src/import-export/qif-import/qif-guess-map.scm:
 	* src/scm/command-line.scm:
 	* src/scm/main.scm:
@@ -8,6 +15,7 @@
 	* src/engine/gnc-filepath-utils.c:
 	* src/engine/gnc-filepath-utils.h:
 	* src/engine/gw-engine-spec.scm:
+	* src/app-utils/file-utils.c:
 	* src/app-utils/gnc-exp-parser.c: Consolidate the creation of all
 	file names under ~/.gnucash, and also consolidate checks for the
 	existence of ~/.gnucash and ~/.gnucash/books.  Add better error

Modified: gnucash/trunk/lib/libqof/qof/guid.c
===================================================================
--- gnucash/trunk/lib/libqof/qof/guid.c	2005-11-23 22:41:21 UTC (rev 12024)
+++ gnucash/trunk/lib/libqof/qof/guid.c	2005-11-23 22:43:32 UTC (rev 12025)
@@ -350,7 +350,7 @@
     for (i = 0; dirs[i] != NULL; i++)
       bytes += init_from_dir(dirs[i], 32);
 
-    dirname = getenv("HOME");
+    dirname = g_get_home_dir();
     if (dirname != NULL)
       bytes += init_from_dir(dirname, 32);
   }

Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c	2005-11-23 22:41:21 UTC (rev 12024)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c	2005-11-23 22:43:32 UTC (rev 12025)
@@ -168,7 +168,7 @@
 gnc_init_default_directory (char **dirname)
 {
   if (*dirname == NULL)
-    *dirname = g_strdup_printf("%s/", getenv("HOME"));
+    *dirname = g_strdup_printf("%s/", g_get_home_dir());
 }
 
 void

Modified: gnucash/trunk/src/engine/test/test-resolve-file-path.c
===================================================================
--- gnucash/trunk/src/engine/test/test-resolve-file-path.c	2005-11-23 22:41:21 UTC (rev 12024)
+++ gnucash/trunk/src/engine/test/test-resolve-file-path.c	2005-11-23 22:43:32 UTC (rev 12025)
@@ -46,12 +46,6 @@
     { NULL, NULL, 0 },
 };
 
-static const char*
-get_home_dir()
-{
-    return getenv("HOME");
-}
-
 int
 main(int argc, char **argv)
 {
@@ -65,14 +59,14 @@
         
         if(strs[i].prefix_home == 1) 
         {
-            dain = g_strdup_printf("%s/%s", get_home_dir(), strs[i].input);
-            wantout = g_strdup_printf("%s/%s", get_home_dir(),
+            dain = g_strdup_printf("%s/%s", g_get_home_dir(), strs[i].input);
+            wantout = g_strdup_printf("%s/%s", g_get_home_dir(),
                                       strs[i].output);
         }
         else if(strs[i].prefix_home == 2)
         {
             dain = g_strdup(strs[i].input);
-            wantout = g_strdup_printf("%s%s", get_home_dir(),
+            wantout = g_strdup_printf("%s%s", g_get_home_dir(),
                                       strs[i].output);
         }
          else

Modified: gnucash/trunk/src/gnome-utils/druid-gconf-setup.c
===================================================================
--- gnucash/trunk/src/gnome-utils/druid-gconf-setup.c	2005-11-23 22:41:21 UTC (rev 12024)
+++ gnucash/trunk/src/gnome-utils/druid-gconf-setup.c	2005-11-23 22:43:32 UTC (rev 12025)
@@ -115,8 +115,8 @@
   gboolean found_user_dir = FALSE;
   FILE *output;
 
-  data_filename = g_strjoin("/", g_getenv("HOME"), ".gconf", (char *)NULL);
-  path_filename = g_strjoin("/", g_getenv("HOME"), ".gconf.path", (char *)NULL);
+  data_filename = g_build_filename(g_get_home_dir(), ".gconf", (char *)NULL);
+  path_filename = g_build_filename(g_get_home_dir(), ".gconf.path", (char *)NULL);
   if (g_file_test(path_filename, G_FILE_TEST_EXISTS)) {
     if (!g_file_get_contents(path_filename, &contents, NULL, error)) {
       g_free(path_filename);



More information about the gnucash-changes mailing list