diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-konqueror.c galeon-1.3.17/bookmarks/bookmarks-export-druid-konqueror.c --- aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-konqueror.c 2004-06-20 00:33:52.000000000 +0200 +++ galeon-1.3.17/bookmarks/bookmarks-export-druid-konqueror.c 2004-08-10 15:04:43.549410600 +0200 @@ -111,28 +111,28 @@ GSList *ret = NULL; gchar *dir; - dir = g_build_filename (g_get_home_dir (), ".kde", NULL); + dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde", NULL); l = gul_find_file (dir, "bookmarks.xbel", 5); ret = g_slist_concat (ret, l); l = gul_find_file (dir, "bookmarks.xml", 5); ret = g_slist_concat (ret, l); g_free (dir); - dir = g_build_filename (g_get_home_dir (), ".kde2", NULL); + dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde2", NULL); l = gul_find_file (dir, "bookmarks.xbel", 5); ret = g_slist_concat (ret, l); l = gul_find_file (dir, "bookmarks.xml", 5); ret = g_slist_concat (ret, l); g_free (dir); - dir = g_build_filename (g_get_home_dir (), ".kde3", NULL); + dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde3", NULL); l = gul_find_file (dir, "bookmarks.xbel", 5); ret = g_slist_concat (ret, l); l = gul_find_file (dir, "bookmarks.xml", 5); ret = g_slist_concat (ret, l); g_free (dir); - dir = g_build_filename (g_get_home_dir (), ".konqueror", NULL); + dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".konqueror", NULL); l = gul_find_file (dir, "bookmarks.xbel", 5); ret = g_slist_concat (ret, l); l = gul_find_file (dir, "bookmarks.xml", 5); @@ -142,7 +142,7 @@ { /* give a default */ ret = g_slist_prepend - (ret, g_build_filename (g_get_home_dir (), + (ret, g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde/share/apps/konqueror/bookmarks.xml", NULL)); } diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c --- aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c 2004-06-20 00:33:52.000000000 +0200 +++ galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c 2004-08-10 15:03:54.309896144 +0200 @@ -111,7 +111,7 @@ gb_export_druid_mozilla_get_locations_impl (GbExportDruid *druid) { GSList *l; - gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL); + gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".mozilla", NULL); l = gul_find_file (dir, "bookmarks.html", 4); if (l == NULL) { diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c --- aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c 2004-06-20 00:33:52.000000000 +0200 +++ galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c 2004-08-10 15:04:10.676408056 +0200 @@ -109,7 +109,7 @@ gb_export_druid_netscape_get_locations_impl (GbExportDruid *druid) { GSList *l; - gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL); + gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".netscape", NULL); l = gul_find_file (dir, "bookmarks.html", 4); if (l == NULL) { diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c --- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c 2004-06-20 00:33:52.000000000 +0200 +++ galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c 2004-08-10 15:03:37.885393048 +0200 @@ -119,7 +119,7 @@ GSList *l; gchar *dir; - dir = g_build_filename (g_get_home_dir (), + dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GNOME_DOT_GNOME, "epiphany", NULL); diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c --- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c 2004-06-20 00:33:52.000000000 +0200 +++ galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c 2004-08-10 15:04:20.988840328 +0200 @@ -121,7 +121,7 @@ for (i = 0; i < G_N_ELEMENTS (galeon_dirs); ++i) { guint j; - dir = g_build_filename (g_get_home_dir (), galeon_dirs[i], NULL); + dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), galeon_dirs[i], NULL); l = gul_find_file (dir, "bookmarks.xbel", 5); ret = g_slist_concat (ret, l); for (j = 0; j < 10; ++j) @@ -140,7 +140,7 @@ /* konqueror locations */ for (i = 0; i < G_N_ELEMENTS (kde_dirs); ++i) { - dir = g_build_filename (g_get_home_dir (), kde_dirs[i], NULL); + dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), kde_dirs[i], NULL); l = gul_find_file (dir, "bookmarks.xbel", 5); ret = g_slist_concat (ret, l); l = gul_find_file (dir, "bookmarks.xml", 5); diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-mozilla.c galeon-1.3.17/bookmarks/bookmarks-import-druid-mozilla.c --- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-mozilla.c 2004-06-20 00:33:52.000000000 +0200 +++ galeon-1.3.17/bookmarks/bookmarks-import-druid-mozilla.c 2004-08-10 15:03:48.495780024 +0200 @@ -108,7 +108,7 @@ gb_import_druid_mozilla_get_locations_impl (GbImportDruid *druid) { GSList *l; - gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL); + gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".mozilla", NULL); l = gul_find_file (dir, "bookmarks.html", 4); g_free (dir); return l; diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-netscape.c galeon-1.3.17/bookmarks/bookmarks-import-druid-netscape.c --- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-netscape.c 2004-06-20 00:33:52.000000000 +0200 +++ galeon-1.3.17/bookmarks/bookmarks-import-druid-netscape.c 2004-08-10 15:03:59.476110760 +0200 @@ -109,7 +109,7 @@ gb_import_druid_netscape_get_locations_impl (GbImportDruid *druid) { GSList *l; - gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL); + gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".netscape", NULL); l = gul_find_file (dir, "bookmarks.html", 4); g_free (dir); return l; diff -urN aa/galeon-1.3.17/bookmarks/testbookmarks.c galeon-1.3.17/bookmarks/testbookmarks.c --- aa/galeon-1.3.17/bookmarks/testbookmarks.c 2004-07-29 14:16:56.000000000 +0200 +++ galeon-1.3.17/bookmarks/testbookmarks.c 2004-08-10 15:05:02.238569416 +0200 @@ -127,7 +127,7 @@ main (int argc, char *argv[]) { gchar *filename = argc == 2 ? argv[1] - : g_strconcat (g_get_home_dir (), + : g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), "/.galeon/bookmarks.xbel", NULL); GbBookmarkSet *set; GbFolder *folder1, *folder2, *r; diff -urN aa/galeon-1.3.17/embed/galeon-embed-popup.c galeon-1.3.17/embed/galeon-embed-popup.c --- aa/galeon-1.3.17/embed/galeon-embed-popup.c 2004-07-14 20:48:33.000000000 +0200 +++ galeon-1.3.17/embed/galeon-embed-popup.c 2004-08-10 15:05:18.307126624 +0200 @@ -655,7 +655,7 @@ persist = galeon_embed_persist_new (popup->priv->embed); base = g_path_get_basename (location); - dest = g_build_filename (g_get_home_dir (), + dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, base, NULL); diff -urN aa/galeon-1.3.17/embed/galeon-embed-utils.c galeon-1.3.17/embed/galeon-embed-utils.c --- aa/galeon-1.3.17/embed/galeon-embed-utils.c 2004-07-18 21:16:04.000000000 +0200 +++ galeon-1.3.17/embed/galeon-embed-utils.c 2004-08-10 15:05:30.706241672 +0200 @@ -241,7 +241,7 @@ GList *retList = NULL; const gchar *file = NULL; - gchar *path = g_build_filename(g_get_home_dir(), + gchar *path = g_build_filename(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(), GALEON_DIR, "stylesheets", NULL); GDir *dir = g_dir_open(path, 0, NULL); @@ -300,7 +300,7 @@ gchar *utf8_path = NULL; gchar *filename = g_filename_from_utf8(sheetfile, -1, NULL, NULL, NULL); - gchar *path = g_build_filename("/", g_get_home_dir(), + gchar *path = g_build_filename("/", getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(), GALEON_DIR, "stylesheets", filename, NULL); g_free(filename); diff -urN aa/galeon-1.3.17/embed/global-history.c galeon-1.3.17/embed/global-history.c --- aa/galeon-1.3.17/embed/global-history.c 2004-06-22 07:00:57.000000000 +0200 +++ galeon-1.3.17/embed/global-history.c 2004-08-10 15:05:12.756970376 +0200 @@ -398,7 +398,7 @@ { char *histfile; - histfile = g_build_filename (g_get_home_dir (), GALEON_DIR, + histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "history2.xml", NULL); if (access (histfile, F_OK) == 0) { @@ -406,7 +406,7 @@ } g_free (histfile); - histfile = g_build_filename (g_get_home_dir (), GALEON_DIR, + histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "history.xml", NULL); if (access (histfile, F_OK) == 0) { @@ -608,7 +608,7 @@ return; } - histfile = g_build_filename (g_get_home_dir (), + histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "history2.xml", NULL); diff -urN aa/galeon-1.3.17/galeon-config-tool.in galeon-1.3.17/galeon-config-tool.in --- aa/galeon-1.3.17/galeon-config-tool.in 2002-03-14 08:40:24.000000000 +0100 +++ galeon-1.3.17/galeon-config-tool.in 2004-08-10 15:09:14.144273928 +0200 @@ -44,6 +44,21 @@ echo "Removing $HOME/.gnome/accels/galeon" rm -rf $HOME/.gnome/accels/galeon + if [ -n "$HOME_ETC" ]; then + echo "Removing $HOME_ETC/.galeon" + rm -rf $HOME_ETC/.galeon + + echo "Removing $HOME_ETC/.gconf/apps/galeon" + rm -rf $HOME_ETC/.gconf/apps/galeon + + echo "Removing $HOME_ETC/.gnome/galeon" + rm -rf $HOME_ETC/.gnome/galeon + + echo "Removing $HOME_ETC/.gnome/accels/galeon" + rm -rf $HOME_ETC/.gnome/accels/galeon + + fi + echo "...Done." else diff -urN aa/galeon-1.3.17/libegg/egg-recent-model.c galeon-1.3.17/libegg/egg-recent-model.c --- aa/galeon-1.3.17/libegg/egg-recent-model.c 2004-08-07 10:05:12.000000000 +0200 +++ galeon-1.3.17/libegg/egg-recent-model.c 2004-08-10 15:05:37.258245616 +0200 @@ -1155,7 +1155,7 @@ model->priv = g_new0 (EggRecentModelPrivate, 1); model->priv->path = g_strdup_printf ("%s" EGG_RECENT_MODEL_FILE_PATH, - g_get_home_dir ()); + getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()); model->priv->mime_filter_values = NULL; model->priv->group_filter_values = NULL; diff -urN aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp galeon-1.3.17/mozilla/mozilla-embed-shell.cpp --- aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp 2004-07-27 22:27:37.000000000 +0200 +++ galeon-1.3.17/mozilla/mozilla-embed-shell.cpp 2004-08-10 15:05:41.881542768 +0200 @@ -43,6 +43,7 @@ #include #include +#include #include #include @@ -339,7 +339,7 @@ mozilla_init_profile (void) { char *profile_path; - profile_path = g_build_filename (g_get_home_dir (), + profile_path = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), MOZILLA_PROFILE_DIR, NULL); gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME); diff -urN aa/galeon-1.3.17/mozilla/ProgressListener.cpp galeon-1.3.17/mozilla/ProgressListener.cpp --- aa/galeon-1.3.17/mozilla/ProgressListener.cpp 2004-08-01 23:43:02.000000000 +0200 +++ galeon-1.3.17/mozilla/ProgressListener.cpp 2004-08-10 15:05:55.201517824 +0200 @@ -903,7 +903,7 @@ !g_file_test (dirName, G_FILE_TEST_IS_DIR)) { g_free (dirName); - dirName = g_strdup (g_get_home_dir ()); + dirName = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()); } diff -urN aa/galeon-1.3.17/src/galeon-favicon-cache.c galeon-1.3.17/src/galeon-favicon-cache.c --- aa/galeon-1.3.17/src/galeon-favicon-cache.c 2004-06-06 14:42:30.000000000 +0200 +++ galeon-1.3.17/src/galeon-favicon-cache.c 2004-08-10 15:06:24.383081552 +0200 @@ -134,11 +134,11 @@ (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - cache->priv->filename = g_build_filename (g_get_home_dir (), + cache->priv->filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "favicon_cache.xml", NULL); - cache->priv->directory = g_build_filename (g_get_home_dir (), + cache->priv->directory = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "favicon_cache/", NULL); diff -urN aa/galeon-1.3.17/src/galeon-shell.c galeon-1.3.17/src/galeon-shell.c --- aa/galeon-1.3.17/src/galeon-shell.c 2004-07-29 21:33:16.000000000 +0200 +++ galeon-1.3.17/src/galeon-shell.c 2004-08-10 15:06:12.927823016 +0200 @@ -318,7 +318,7 @@ if (gs->priv->toolbars_model) { - gchar *tb_file = g_build_filename (g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL); + gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL); egg_toolbars_model_save (gs->priv->toolbars_model, tb_file, "0"); g_free (tb_file); g_object_unref (gs->priv->toolbars_model); @@ -651,7 +651,7 @@ { /* this is temp code, I need to think about how to properly initialize bookmarks */ GbXBEL *io = gb_xbel_new (); - gchar *filename = g_strconcat (g_get_home_dir (), "/", + gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), "/", GALEON_DIR "/bookmarks.xbel", NULL); /* init the bookmark icon provider */ diff -urN galeon-1.3.19/src/galeon-sidebars.c.orig galeon-1.3.19/src/galeon-sidebars.c --- galeon-1.3.19/src/galeon-sidebars.c.orig 2005-02-26 15:08:49.201988840 +0100 +++ galeon-1.3.19/src/galeon-sidebars.c 2005-02-26 15:09:15.635970264 +0100 @@ -432,7 +432,7 @@ sidebars->priv = p; - sidebars->priv->filename = g_build_filename(g_get_home_dir(), + sidebars->priv->filename = g_build_filename(getenv("HOME_ETC")!=NULL? getenv("HOME_ETC"): g_get_home_dir(), GALEON_DIR"/sidebars.xml", NULL); galeon_sidebars_load (sidebars); diff -urN aa/galeon-1.3.17/src/migrate.c galeon-1.3.17/src/migrate.c --- aa/galeon-1.3.17/src/migrate.c 2004-07-04 11:41:53.000000000 +0200 +++ galeon-1.3.17/src/migrate.c 2004-08-10 15:06:50.993036224 +0200 @@ -247,7 +247,7 @@ static void migrate_toolbar () { - gchar *tb_file = g_build_filename (g_get_home_dir (), + gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL); gchar *toolbar; diff -urN aa/galeon-1.3.17/src/popup-commands.c galeon-1.3.17/src/popup-commands.c --- aa/galeon-1.3.17/src/popup-commands.c 2004-08-07 19:09:26.000000000 +0200 +++ galeon-1.3.17/src/popup-commands.c 2004-08-10 15:06:29.432313952 +0200 @@ -439,7 +439,7 @@ persist = galeon_embed_persist_new (embed); base = g_path_get_basename (location); - dest = g_build_filename (g_get_home_dir (), + dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, base, NULL); diff -urN aa/galeon-1.3.17/src/session.c galeon-1.3.17/src/session.c --- aa/galeon-1.3.17/src/session.c 2004-06-06 14:42:30.000000000 +0200 +++ galeon-1.3.17/src/session.c 2004-08-10 15:06:44.638002336 +0200 @@ -171,14 +171,14 @@ if (strcmp (filename, SESSION_SAVED) == 0) { - save_to = g_build_filename (g_get_home_dir (), + save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "session_saved.xml", NULL); } else if (strcmp (filename, SESSION_CRASHED) == 0) { - save_to = g_build_filename (g_get_home_dir (), + save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "session_crashed.xml", NULL); @@ -187,7 +187,7 @@ { char *tmp; - save_to = g_build_filename (g_get_home_dir (), + save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "session_gnome-XXXXXX", NULL); diff -urN aa/galeon-1.3.17/utils/gul-download.c galeon-1.3.17/utils/gul-download.c --- aa/galeon-1.3.17/utils/gul-download.c 2004-03-30 23:33:06.000000000 +0200 +++ galeon-1.3.17/utils/gul-download.c 2004-08-10 15:07:00.277624752 +0200 @@ -74,7 +74,7 @@ prefDir = eel_gconf_get_string(CONF_DOWNLOADING_DIR); if (!prefDir) { - prefDir = g_strdup (g_get_home_dir()); + prefDir = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir()); } utf8DirName = g_strconcat(prefDir, "/", NULL); g_free(prefDir); @@ -179,7 +179,7 @@ } else { - utf8ExpDir = g_strdup(g_get_home_dir()); + utf8ExpDir = g_strdup(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir()); } /* Dirname must be locale encoded as explained above */ diff -urN aa/galeon-1.3.17/utils/gul-file-chooser.c galeon-1.3.17/utils/gul-file-chooser.c --- aa/galeon-1.3.17/utils/gul-file-chooser.c 2004-07-18 21:23:36.000000000 +0200 +++ galeon-1.3.17/utils/gul-file-chooser.c 2004-08-10 15:07:17.510005032 +0200 @@ -311,18 +311,18 @@ */ if (download_dir != NULL && - !str_is_equal (download_dir, g_get_home_dir ())) + !str_is_equal (download_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ())) { gtk_file_chooser_add_shortcut_folder (chooser, download_dir, NULL); } if (upload_dir != NULL && - !str_is_equal (upload_dir, g_get_home_dir ()) && + !str_is_equal (upload_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()) && !str_is_equal (upload_dir, download_dir)) { gtk_file_chooser_add_shortcut_folder (chooser, upload_dir, NULL); } if (open_dir != NULL && - !str_is_equal (open_dir, g_get_home_dir ()) && + !str_is_equal (open_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()) && !str_is_equal (open_dir, download_dir) && !str_is_equal (open_dir, upload_dir)) { diff -urN aa/galeon-1.3.17/utils/gul-general.c galeon-1.3.17/utils/gul-general.c --- aa/galeon-1.3.17/utils/gul-general.c 2004-03-30 23:33:06.000000000 +0200 +++ galeon-1.3.17/utils/gul-general.c 2004-08-10 15:07:06.053746648 +0200 @@ -178,7 +178,7 @@ } /* try the default */ - file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL); + file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, fname, NULL); /* success? */ if (g_file_test (file, G_FILE_TEST_EXISTS)) diff -urN aa/galeon-1.3.17/utils/gul-state.c galeon-1.3.17/utils/gul-state.c --- aa/galeon-1.3.17/utils/gul-state.c 2004-03-29 23:55:56.000000000 +0200 +++ galeon-1.3.17/utils/gul-state.c 2004-08-10 15:07:22.590232720 +0200 @@ -53,7 +53,7 @@ #endif /* Using ~/.galeon/state.ini to keep all files together. */ - filename = g_build_filename (g_get_home_dir(), + filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(), ".galeon", "state.ini", NULL); #ifdef USE_GKEYFILE diff -urN aa/galeon-1.3.17/utils/gul-string.c galeon-1.3.17/utils/gul-string.c --- aa/galeon-1.3.17/utils/gul-string.c 2004-03-30 23:33:06.000000000 +0200 +++ galeon-1.3.17/utils/gul-string.c 2004-08-10 15:07:29.456188936 +0200 @@ -315,7 +315,7 @@ if (!str) return NULL; if (str[0] != '~') return g_strdup (str); - return g_strconcat (g_get_home_dir (), str + 1, NULL); + return g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), str + 1, NULL); } int