galeon-home_etc.patch

   1 diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-konqueror.c galeon-1.3.17/bookmarks/bookmarks-export-druid-konqueror.c
   2 --- aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-konqueror.c       2004-06-20 00:33:52.000000000 +0200
   3 +++ galeon-1.3.17/bookmarks/bookmarks-export-druid-konqueror.c  2004-08-10 15:04:43.549410600 +0200
   4 @@ -111,28 +111,28 @@
   5         GSList *ret = NULL;
   6         gchar *dir;
   7
   8 -       dir = g_build_filename (g_get_home_dir (), ".kde", NULL);
   9 +       dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde", NULL);
  10         l = gul_find_file  (dir, "bookmarks.xbel", 5);
  11         ret = g_slist_concat (ret, l);
  12         l = gul_find_file (dir, "bookmarks.xml", 5);
  13         ret = g_slist_concat (ret, l);
  14         g_free (dir);
  15
  16 -       dir = g_build_filename (g_get_home_dir (), ".kde2", NULL);
  17 +       dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde2", NULL);
  18         l = gul_find_file (dir, "bookmarks.xbel", 5);
  19         ret = g_slist_concat (ret, l);
  20         l = gul_find_file (dir, "bookmarks.xml", 5);
  21         ret = g_slist_concat (ret, l);
  22         g_free (dir);
  23
  24 -       dir = g_build_filename (g_get_home_dir (), ".kde3", NULL);
  25 +       dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".kde3", NULL);
  26         l = gul_find_file (dir, "bookmarks.xbel", 5);
  27         ret = g_slist_concat (ret, l);
  28         l = gul_find_file (dir, "bookmarks.xml", 5);
  29         ret = g_slist_concat (ret, l);
  30         g_free (dir);
  31
  32 -       dir = g_build_filename (g_get_home_dir (), ".konqueror", NULL);
  33 +       dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".konqueror", NULL);
  34         l = gul_find_file (dir, "bookmarks.xbel", 5);
  35         ret = g_slist_concat (ret, l);
  36         l = gul_find_file (dir, "bookmarks.xml", 5);
  37 @@ -142,7 +142,7 @@
  38         {
  39                 /* give a default */
  40                 ret = g_slist_prepend
  41 -                       (ret, g_build_filename (g_get_home_dir (),
  42 +                       (ret, g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (),
  43                                                 ".kde/share/apps/konqueror/bookmarks.xml", NULL));
  44         }
  45
  46 diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c
  47 --- aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c 2004-06-20 00:33:52.000000000 +0200
  48 +++ galeon-1.3.17/bookmarks/bookmarks-export-druid-mozilla.c    2004-08-10 15:03:54.309896144 +0200
  49 @@ -111,7 +111,7 @@
  50  gb_export_druid_mozilla_get_locations_impl (GbExportDruid *druid)
  51  {
  52         GSList *l;
  53 -       gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL);
  54 +       gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".mozilla", NULL);
  55         l = gul_find_file  (dir, "bookmarks.html", 4);
  56         if (l == NULL)
  57         {
  58 diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c
  59 --- aa/galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c        2004-06-20 00:33:52.000000000 +0200
  60 +++ galeon-1.3.17/bookmarks/bookmarks-export-druid-netscape.c   2004-08-10 15:04:10.676408056 +0200
  61 @@ -109,7 +109,7 @@
  62  gb_export_druid_netscape_get_locations_impl (GbExportDruid *druid)
  63  {
  64         GSList *l;
  65 -       gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL);
  66 +       gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".netscape", NULL);
  67         l = gul_find_file (dir, "bookmarks.html", 4);
  68         if (l == NULL)
  69         {
  70 diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c
  71 --- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c        2004-06-20 00:33:52.000000000 +0200
  72 +++ galeon-1.3.17/bookmarks/bookmarks-import-druid-epiphany.c   2004-08-10 15:03:37.885393048 +0200
  73 @@ -119,7 +119,7 @@
  74         GSList *l;
  75         gchar *dir;
  76
  77 -       dir = g_build_filename (g_get_home_dir (),
  78 +       dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
  79                                 GNOME_DOT_GNOME,
  80                                 "epiphany",
  81                                 NULL);
  82 diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c
  83 --- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c       2004-06-20 00:33:52.000000000 +0200
  84 +++ galeon-1.3.17/bookmarks/bookmarks-import-druid-konqueror.c  2004-08-10 15:04:20.988840328 +0200
  85 @@ -121,7 +121,7 @@
  86         for (i = 0; i < G_N_ELEMENTS (galeon_dirs); ++i)
  87         {
  88                 guint j;
  89 -               dir = g_build_filename (g_get_home_dir (), galeon_dirs[i], NULL);
  90 +               dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), galeon_dirs[i], NULL);
  91                 l = gul_find_file  (dir, "bookmarks.xbel", 5);
  92                 ret = g_slist_concat (ret, l);
  93                 for (j = 0; j < 10; ++j)
  94 @@ -140,7 +140,7 @@
  95         /* konqueror locations */
  96         for (i = 0; i < G_N_ELEMENTS (kde_dirs); ++i)
  97         {
  98 -               dir = g_build_filename (g_get_home_dir (), kde_dirs[i], NULL);
  99 +               dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), kde_dirs[i], NULL);
 100                 l = gul_find_file  (dir, "bookmarks.xbel", 5);
 101                 ret = g_slist_concat (ret, l);
 102                 l = gul_find_file (dir, "bookmarks.xml", 5);
 103 diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-mozilla.c galeon-1.3.17/bookmarks/bookmarks-import-druid-mozilla.c
 104 --- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-mozilla.c 2004-06-20 00:33:52.000000000 +0200
 105 +++ galeon-1.3.17/bookmarks/bookmarks-import-druid-mozilla.c    2004-08-10 15:03:48.495780024 +0200
 106 @@ -108,7 +108,7 @@
 107  gb_import_druid_mozilla_get_locations_impl (GbImportDruid *druid)
 108  {
 109         GSList *l;
 110 -       gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL);
 111 +       gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".mozilla", NULL);
 112         l = gul_find_file  (dir, "bookmarks.html", 4);
 113         g_free (dir);
 114         return l;
 115 diff -urN aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-netscape.c galeon-1.3.17/bookmarks/bookmarks-import-druid-netscape.c
 116 --- aa/galeon-1.3.17/bookmarks/bookmarks-import-druid-netscape.c        2004-06-20 00:33:52.000000000 +0200
 117 +++ galeon-1.3.17/bookmarks/bookmarks-import-druid-netscape.c   2004-08-10 15:03:59.476110760 +0200
 118 @@ -109,7 +109,7 @@
 119  gb_import_druid_netscape_get_locations_impl (GbImportDruid *druid)
 120  {
 121         GSList *l;
 122 -       gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL);
 123 +       gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".netscape", NULL);
 124         l = gul_find_file (dir, "bookmarks.html", 4);
 125         g_free (dir);
 126         return l;
 127 diff -urN aa/galeon-1.3.17/bookmarks/testbookmarks.c galeon-1.3.17/bookmarks/testbookmarks.c
 128 --- aa/galeon-1.3.17/bookmarks/testbookmarks.c  2004-07-29 14:16:56.000000000 +0200
 129 +++ galeon-1.3.17/bookmarks/testbookmarks.c     2004-08-10 15:05:02.238569416 +0200
 130 @@ -127,7 +127,7 @@
 131  main (int argc, char *argv[])
 132  {
 133         gchar *filename = argc == 2 ? argv[1]
 134 -               : g_strconcat (g_get_home_dir (),
 135 +               : g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 136                                "/.galeon/bookmarks.xbel", NULL);
 137         GbBookmarkSet *set;
 138         GbFolder *folder1, *folder2, *r;
 139 diff -urN aa/galeon-1.3.17/embed/galeon-embed-popup.c galeon-1.3.17/embed/galeon-embed-popup.c
 140 --- aa/galeon-1.3.17/embed/galeon-embed-popup.c 2004-07-14 20:48:33.000000000 +0200
 141 +++ galeon-1.3.17/embed/galeon-embed-popup.c    2004-08-10 15:05:18.307126624 +0200
 142 @@ -655,7 +655,7 @@
 143         persist = galeon_embed_persist_new (popup->priv->embed);
 144
 145         base = g_path_get_basename (location);
 146 -       dest = g_build_filename (g_get_home_dir (),
 147 +       dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 148                                  GALEON_DIR,
 149                                  base, NULL);
 150
 151 diff -urN aa/galeon-1.3.17/embed/galeon-embed-utils.c galeon-1.3.17/embed/galeon-embed-utils.c
 152 --- aa/galeon-1.3.17/embed/galeon-embed-utils.c 2004-07-18 21:16:04.000000000 +0200
 153 +++ galeon-1.3.17/embed/galeon-embed-utils.c    2004-08-10 15:05:30.706241672 +0200
 154 @@ -241,7 +241,7 @@
 155         GList *retList = NULL;
 156
 157         const gchar *file = NULL;
 158 -       gchar *path = g_build_filename(g_get_home_dir(),
 159 +       gchar *path = g_build_filename(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
 160                                        GALEON_DIR, "stylesheets",
 161                                        NULL);
 162         GDir *dir = g_dir_open(path, 0, NULL);
 163 @@ -300,7 +300,7 @@
 164         gchar *utf8_path = NULL;
 165         gchar *filename = g_filename_from_utf8(sheetfile, -1,
 166                                                NULL, NULL, NULL);
 167 -       gchar *path = g_build_filename("/", g_get_home_dir(),
 168 +       gchar *path = g_build_filename("/", getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
 169                                        GALEON_DIR, "stylesheets",
 170                                        filename, NULL);
 171         g_free(filename);
 172 diff -urN aa/galeon-1.3.17/embed/global-history.c galeon-1.3.17/embed/global-history.c
 173 --- aa/galeon-1.3.17/embed/global-history.c     2004-06-22 07:00:57.000000000 +0200
 174 +++ galeon-1.3.17/embed/global-history.c        2004-08-10 15:05:12.756970376 +0200
 175 @@ -398,7 +398,7 @@
 176  {
 177         char *histfile;
 178
 179 -       histfile = g_build_filename (g_get_home_dir (), GALEON_DIR,
 180 +    histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR,
 181                                      "history2.xml", NULL);
 182         if (access (histfile, F_OK) == 0)
 183         {
 184 @@ -406,7 +406,7 @@
 185         }
 186         g_free (histfile);
 187
 188 -       histfile = g_build_filename (g_get_home_dir (), GALEON_DIR,
 189 +    histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR,
 190                                      "history.xml", NULL);
 191         if (access (histfile, F_OK) == 0)
 192         {
 193 @@ -608,7 +608,7 @@
 194                 return;
 195         }
 196
 197 -       histfile = g_build_filename (g_get_home_dir (),
 198 +       histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 199                                      GALEON_DIR,
 200                                      "history2.xml",
 201                                      NULL);
 202 diff -urN aa/galeon-1.3.17/galeon-config-tool.in galeon-1.3.17/galeon-config-tool.in
 203 --- aa/galeon-1.3.17/galeon-config-tool.in      2002-03-14 08:40:24.000000000 +0100
 204 +++ galeon-1.3.17/galeon-config-tool.in 2004-08-10 15:09:14.144273928 +0200
 205 @@ -44,6 +44,21 @@
 206                     echo "Removing $HOME/.gnome/accels/galeon"
 207                     rm -rf $HOME/.gnome/accels/galeon
 208
 209 +                               if [ -n "$HOME_ETC" ]; then
 210 +                                       echo "Removing $HOME_ETC/.galeon"
 211 +                                       rm -rf $HOME_ETC/.galeon
 212 +
 213 +                                       echo "Removing $HOME_ETC/.gconf/apps/galeon"
 214 +                                       rm -rf $HOME_ETC/.gconf/apps/galeon
 215 +
 216 +                                       echo "Removing $HOME_ETC/.gnome/galeon"
 217 +                                       rm -rf $HOME_ETC/.gnome/galeon
 218 +
 219 +                                       echo "Removing $HOME_ETC/.gnome/accels/galeon"
 220 +                                       rm -rf $HOME_ETC/.gnome/accels/galeon
 221 +
 222 +                               fi
 223 +
 224                     echo "...Done."
 225
 226             else
 227 diff -urN aa/galeon-1.3.17/libegg/egg-recent-model.c galeon-1.3.17/libegg/egg-recent-model.c
 228 --- aa/galeon-1.3.17/libegg/egg-recent-model.c  2004-08-07 10:05:12.000000000 +0200
 229 +++ galeon-1.3.17/libegg/egg-recent-model.c     2004-08-10 15:05:37.258245616 +0200
 230 @@ -1155,7 +1155,7 @@
 231         model->priv = g_new0 (EggRecentModelPrivate, 1);
 232
 233         model->priv->path = g_strdup_printf ("%s" EGG_RECENT_MODEL_FILE_PATH,
 234 -                                            g_get_home_dir ());
 235 +                                            getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ());
 236
 237         model->priv->mime_filter_values   = NULL;
 238         model->priv->group_filter_values  = NULL;
 239 diff -urN aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp galeon-1.3.17/mozilla/mozilla-embed-shell.cpp
 240 --- aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp    2004-07-27 22:27:37.000000000 +0200
 241 +++ galeon-1.3.17/mozilla/mozilla-embed-shell.cpp       2004-08-10 15:05:41.881542768 +0200
 242 @@ -43,6 +43,7 @@
 243
 244  #include <time.h>
 245  #include <glib/gi18n.h>
 246 +#include <stdlib.h>
 247  #include <string.h>
 248
 249  #include <nsIConsoleService.h>
 250 @@ -339,7 +339,7 @@
 251  mozilla_init_profile (void)
 252  {
 253         char *profile_path;
 254 -       profile_path = g_build_filename (g_get_home_dir (),
 255 +       profile_path = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 256                                          MOZILLA_PROFILE_DIR,
 257                                          NULL);
 258          gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
 259 diff -urN aa/galeon-1.3.17/mozilla/ProgressListener.cpp galeon-1.3.17/mozilla/ProgressListener.cpp
 260 --- aa/galeon-1.3.17/mozilla/ProgressListener.cpp       2004-08-01 23:43:02.000000000 +0200
 261 +++ galeon-1.3.17/mozilla/ProgressListener.cpp  2004-08-10 15:05:55.201517824 +0200
 262 @@ -903,7 +903,7 @@
 263             !g_file_test (dirName, G_FILE_TEST_IS_DIR))
 264         {
 265                 g_free (dirName);
 266 -               dirName = g_strdup (g_get_home_dir ());
 267 +               dirName = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ());
 268         }
 269
 270
 271 diff -urN aa/galeon-1.3.17/src/galeon-favicon-cache.c galeon-1.3.17/src/galeon-favicon-cache.c
 272 --- aa/galeon-1.3.17/src/galeon-favicon-cache.c 2004-06-06 14:42:30.000000000 +0200
 273 +++ galeon-1.3.17/src/galeon-favicon-cache.c    2004-08-10 15:06:24.383081552 +0200
 274 @@ -134,11 +134,11 @@
 275                                                                 (GDestroyNotify) g_free,
 276                                                                 (GDestroyNotify) g_object_unref);
 277
 278 -       cache->priv->filename  = g_build_filename (g_get_home_dir (),
 279 +       cache->priv->filename  = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 280                                                    GALEON_DIR,
 281                                                    "favicon_cache.xml",
 282                                                    NULL);
 283 -       cache->priv->directory = g_build_filename (g_get_home_dir (),
 284 +       cache->priv->directory = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 285                                                    GALEON_DIR,
 286                                                    "favicon_cache/",
 287                                                    NULL);
 288 diff -urN aa/galeon-1.3.17/src/galeon-shell.c galeon-1.3.17/src/galeon-shell.c
 289 --- aa/galeon-1.3.17/src/galeon-shell.c 2004-07-29 21:33:16.000000000 +0200
 290 +++ galeon-1.3.17/src/galeon-shell.c    2004-08-10 15:06:12.927823016 +0200
 291 @@ -318,7 +318,7 @@
 292
 293         if (gs->priv->toolbars_model)
 294         {
 295 -               gchar *tb_file = g_build_filename (g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
 296 +               gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
 297                 egg_toolbars_model_save (gs->priv->toolbars_model, tb_file, "0");
 298                 g_free (tb_file);
 299                 g_object_unref (gs->priv->toolbars_model);
 300 @@ -651,7 +651,7 @@
 301  {
 302         /* this is temp code, I need to think about how to properly initialize bookmarks */
 303         GbXBEL *io = gb_xbel_new ();
 304 -       gchar *filename = g_strconcat (g_get_home_dir (), "/",
 305 +       gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), "/",
 306                                        GALEON_DIR "/bookmarks.xbel", NULL);
 307
 308         /* init the bookmark icon provider */
 309 diff -urN galeon-1.3.19/src/galeon-sidebars.c.orig galeon-1.3.19/src/galeon-sidebars.c
 310 --- galeon-1.3.19/src/galeon-sidebars.c.orig    2005-02-26 15:08:49.201988840 +0100
 311 +++ galeon-1.3.19/src/galeon-sidebars.c 2005-02-26 15:09:15.635970264 +0100
 312 @@ -432,7 +432,7 @@
 313         sidebars->priv = p;
 314
 315
 316 -       sidebars->priv->filename = g_build_filename(g_get_home_dir(),
 317 +       sidebars->priv->filename = g_build_filename(getenv("HOME_ETC")!=NULL? getenv("HOME_ETC"): g_get_home_dir(),
 318                                                     GALEON_DIR"/sidebars.xml",
 319                                                     NULL);
 320         galeon_sidebars_load (sidebars);
 321 diff -urN aa/galeon-1.3.17/src/migrate.c galeon-1.3.17/src/migrate.c
 322 --- aa/galeon-1.3.17/src/migrate.c      2004-07-04 11:41:53.000000000 +0200
 323 +++ galeon-1.3.17/src/migrate.c 2004-08-10 15:06:50.993036224 +0200
 324 @@ -247,7 +247,7 @@
 325  static void
 326  migrate_toolbar ()
 327  {
 328 -       gchar *tb_file = g_build_filename (g_get_home_dir (),
 329 +       gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 330                                            GALEON_DIR, "toolbars.xml", NULL);
 331
 332         gchar *toolbar;
 333 diff -urN aa/galeon-1.3.17/src/popup-commands.c galeon-1.3.17/src/popup-commands.c
 334 --- aa/galeon-1.3.17/src/popup-commands.c       2004-08-07 19:09:26.000000000 +0200
 335 +++ galeon-1.3.17/src/popup-commands.c  2004-08-10 15:06:29.432313952 +0200
 336 @@ -439,7 +439,7 @@
 337         persist = galeon_embed_persist_new (embed);
 338
 339         base = g_path_get_basename (location);
 340 -       dest = g_build_filename (g_get_home_dir (),
 341 +       dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 342                                  GALEON_DIR,
 343                                  base, NULL);
 344
 345 diff -urN aa/galeon-1.3.17/src/session.c galeon-1.3.17/src/session.c
 346 --- aa/galeon-1.3.17/src/session.c      2004-06-06 14:42:30.000000000 +0200
 347 +++ galeon-1.3.17/src/session.c 2004-08-10 15:06:44.638002336 +0200
 348 @@ -171,14 +171,14 @@
 349
 350         if (strcmp (filename, SESSION_SAVED) == 0)
 351         {
 352 -               save_to = g_build_filename (g_get_home_dir (),
 353 +               save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 354                                             GALEON_DIR,
 355                                             "session_saved.xml",
 356                                             NULL);
 357         }
 358         else if (strcmp (filename, SESSION_CRASHED) == 0)
 359         {
 360 -               save_to = g_build_filename (g_get_home_dir (),
 361 +               save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 362                                             GALEON_DIR,
 363                                             "session_crashed.xml",
 364                                             NULL);
 365 @@ -187,7 +187,7 @@
 366         {
 367                 char *tmp;
 368
 369 -               save_to = g_build_filename (g_get_home_dir (),
 370 +               save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
 371                                             GALEON_DIR,
 372                                             "session_gnome-XXXXXX",
 373                                             NULL);
 374 diff -urN aa/galeon-1.3.17/utils/gul-download.c galeon-1.3.17/utils/gul-download.c
 375 --- aa/galeon-1.3.17/utils/gul-download.c       2004-03-30 23:33:06.000000000 +0200
 376 +++ galeon-1.3.17/utils/gul-download.c  2004-08-10 15:07:00.277624752 +0200
 377 @@ -74,7 +74,7 @@
 378                 prefDir = eel_gconf_get_string(CONF_DOWNLOADING_DIR);
 379                 if (!prefDir)
 380                 {
 381 -                       prefDir = g_strdup (g_get_home_dir());
 382 +                       prefDir = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
 383                 }
 384                 utf8DirName = g_strconcat(prefDir, "/", NULL);
 385                 g_free(prefDir);
 386 @@ -179,7 +179,7 @@
 387         }
 388         else
 389         {
 390 -               utf8ExpDir = g_strdup(g_get_home_dir());
 391 +               utf8ExpDir = g_strdup(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
 392         }
 393
 394         /* Dirname must be locale encoded as explained above */
 395 diff -urN aa/galeon-1.3.17/utils/gul-file-chooser.c galeon-1.3.17/utils/gul-file-chooser.c
 396 --- aa/galeon-1.3.17/utils/gul-file-chooser.c   2004-07-18 21:23:36.000000000 +0200
 397 +++ galeon-1.3.17/utils/gul-file-chooser.c      2004-08-10 15:07:17.510005032 +0200
 398 @@ -311,18 +311,18 @@
 399          */
 400
 401         if (download_dir != NULL &&
 402 -           !str_is_equal (download_dir, g_get_home_dir ()))
 403 +           !str_is_equal (download_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()))
 404         {
 405                 gtk_file_chooser_add_shortcut_folder (chooser, download_dir, NULL);
 406         }
 407         if (upload_dir != NULL &&
 408 -           !str_is_equal (upload_dir, g_get_home_dir ()) &&
 409 +           !str_is_equal (upload_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()) &&
 410             !str_is_equal (upload_dir, download_dir))
 411         {
 412                 gtk_file_chooser_add_shortcut_folder (chooser, upload_dir, NULL);
 413         }
 414         if (open_dir != NULL &&
 415 -           !str_is_equal (open_dir, g_get_home_dir ()) &&
 416 +           !str_is_equal (open_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()) &&
 417             !str_is_equal (open_dir, download_dir) &&
 418             !str_is_equal (open_dir, upload_dir))
 419         {
 420 diff -urN aa/galeon-1.3.17/utils/gul-general.c galeon-1.3.17/utils/gul-general.c
 421 --- aa/galeon-1.3.17/utils/gul-general.c        2004-03-30 23:33:06.000000000 +0200
 422 +++ galeon-1.3.17/utils/gul-general.c   2004-08-10 15:07:06.053746648 +0200
 423 @@ -178,7 +178,7 @@
 424         }
 425
 426         /* try the default */
 427 -       file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL);
 428 +       file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, fname, NULL);
 429
 430         /* success? */
 431         if (g_file_test (file, G_FILE_TEST_EXISTS))
 432 diff -urN aa/galeon-1.3.17/utils/gul-state.c galeon-1.3.17/utils/gul-state.c
 433 --- aa/galeon-1.3.17/utils/gul-state.c  2004-03-29 23:55:56.000000000 +0200
 434 +++ galeon-1.3.17/utils/gul-state.c     2004-08-10 15:07:22.590232720 +0200
 435 @@ -53,7 +53,7 @@
 436  #endif
 437
 438         /* Using ~/.galeon/state.ini to keep all files together. */
 439 -       filename = g_build_filename (g_get_home_dir(),
 440 +       filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
 441                                      ".galeon", "state.ini", NULL);
 442
 443  #ifdef USE_GKEYFILE
 444 diff -urN aa/galeon-1.3.17/utils/gul-string.c galeon-1.3.17/utils/gul-string.c
 445 --- aa/galeon-1.3.17/utils/gul-string.c 2004-03-30 23:33:06.000000000 +0200
 446 +++ galeon-1.3.17/utils/gul-string.c    2004-08-10 15:07:29.456188936 +0200
 447 @@ -315,7 +315,7 @@
 448          if (!str) return NULL;
 449          if (str[0] != '~') return g_strdup (str);
 450
 451 -        return g_strconcat (g_get_home_dir (), str + 1, NULL);
 452 +        return g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), str + 1, NULL);
 453  }
 454
 455  int