[maemo-commits] [maemo-commits] r10425 - in projects/haf/trunk/hildon-desktop: . libhildondesktop src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-03-06 16:27:16 +0200 (Tue, 06 Mar 2007)
New Revision: 10425

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c
   projects/haf/trunk/hildon-desktop/src/hn-others-button.c
Log:
2007-03-06  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hn-others-button.c, libhildondesktop/hildon-home-window.c: use
	g_get_home_dir () when applicable.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-06 13:54:07 UTC (rev 10424)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-06 14:27:16 UTC (rev 10425)
@@ -1,3 +1,8 @@
+2007-03-06  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* src/hn-others-button.c, libhildondesktop/hildon-home-window.c: use
+	g_get_home_dir () when applicable.
+
 2007-03-06  Johan Bilien  <johan.bilien at nokia.com>
 
 	* libhildondesktop/hildon-desktop-home-item.c:

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c	2007-03-06 13:54:07 UTC (rev 10424)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c	2007-03-06 14:27:16 UTC (rev 10425)
@@ -159,7 +159,7 @@
   if (!hildon_home_area_get_layout_mode (HILDON_HOME_AREA (priv->applet_area)))
     {
       GError *error = NULL;
-      gchar *filename = g_build_filename (g_getenv ("HOME"),
+      gchar *filename = g_build_filename (g_get_home_dir (),
                                           HH_AREA_CONFIGURATION_FILE,
                                           NULL);
 
@@ -212,7 +212,7 @@
           hildon_home_area_set_layout_mode (HILDON_HOME_AREA (priv->applet_area),
                                             FALSE);
 
-          user_filename = g_build_filename (g_getenv ("HOME"),
+          user_filename = g_build_filename (g_get_home_dir (),
                                             HH_AREA_CONFIGURATION_FILE,
                                             NULL);
 
@@ -268,7 +268,7 @@
   hildon_home_area_set_layout_mode (HILDON_HOME_AREA (priv->applet_area),
                                     FALSE);
   
-  filename = g_build_filename (g_getenv ("HOME"),
+  filename = g_build_filename (g_get_home_dir (),
                                HH_AREA_CONFIGURATION_FILE,
                                NULL);
   
@@ -297,7 +297,7 @@
   gchar *filename = NULL;
   GError *error = NULL;
 
-  user_filename = g_build_filename (g_getenv ("HOME"),
+  user_filename = g_build_filename (g_get_home_dir (),
                                     HH_AREA_CONFIGURATION_FILE,
                                     NULL);
 
@@ -391,7 +391,7 @@
   gchar *filename = NULL;
   GError *error = NULL;
 
-  user_filename = g_build_filename (g_getenv ("HOME"),
+  user_filename = g_build_filename (g_get_home_dir (),
                                     HH_AREA_CONFIGURATION_FILE,
                                     NULL);
 

Modified: projects/haf/trunk/hildon-desktop/src/hn-others-button.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-03-06 13:54:07 UTC (rev 10424)
+++ projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-03-06 14:27:16 UTC (rev 10425)
@@ -1005,14 +1005,11 @@
 void
 hn_others_button_register_monitors (HNOthersButton * button)
 {
-  const gchar *home_dir;
   gchar *dir;
   gchar	*file = NULL;
   gchar *conf_file;
 
-  home_dir = getenv ("HOME");
-  
-  conf_file = g_build_filename (home_dir, USER_MENU_FILE, NULL);
+  conf_file = g_build_filename (g_get_home_dir (), USER_MENU_FILE, NULL);
  
   /* We copy SYSTEMWIDE_MENU_FILE to always track the changes */
   if (!g_file_test (conf_file, G_FILE_TEST_EXISTS))
@@ -1041,7 +1038,7 @@
   g_free (dir);
   
   /* Watch user specific menu conf */
-  if (home_dir && *home_dir)
+  if (g_get_home_dir ())
   {    
     /* Have to get the directory from the path because the USER_MENU_FILE
        define might contain directory (it does, in fact). */