[gnome-panel] util: don't hardcode .gnome2



commit 0a6519b5bf0cbb2b76dead44df4d1f3704b6cc5b
Author: Ray Strode <rstrode redhat com>
Date:   Mon Oct 18 13:18:25 2010 -0400

    util: don't hardcode .gnome2
    
    libgnome supports relocating the .gnome2 directory with an environment
    variable.
    
    This commit makes gnome-panel look at that environment variable.
    
    Related Bug: http://bugzilla.gnome.org/614032

 gnome-panel/panel-util.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/gnome-panel/panel-util.c b/gnome-panel/panel-util.c
index 8a5298b..30a235b 100644
--- a/gnome-panel/panel-util.c
+++ b/gnome-panel/panel-util.c
@@ -439,8 +439,16 @@ panel_lock_screen (GdkScreen *screen)
 static char *
 panel_launcher_get_personal_path (void)
 {
-	return g_build_filename (g_get_home_dir (), ".gnome2",
-				 PANEL_LAUNCHER_PERSONAL_PATH, NULL);
+        const char *override;
+
+        override = g_getenv ("GNOME22_USER_DIR");
+
+        if (override)
+               return g_build_filename (override,
+                                        PANEL_LAUNCHER_PERSONAL_PATH, NULL);
+        else
+                return g_build_filename (g_get_home_dir (), ".gnome2",
+                                         PANEL_LAUNCHER_PERSONAL_PATH, NULL);
 }
 
 gboolean



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]