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
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);
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);
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);
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);
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));
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
50 gb_export_druid_mozilla_get_locations_impl (GbExportDruid *druid)
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);
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
62 gb_export_druid_netscape_get_locations_impl (GbExportDruid *druid)
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);
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
77 - dir = g_build_filename (g_get_home_dir (),
78 + dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
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
86 for (i = 0; i < G_N_ELEMENTS (galeon_dirs); ++i)
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)
95 /* konqueror locations */
96 for (i = 0; i < G_N_ELEMENTS (kde_dirs); ++i)
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
107 gb_import_druid_mozilla_get_locations_impl (GbImportDruid *druid)
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);
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
119 gb_import_druid_netscape_get_locations_impl (GbImportDruid *druid)
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);
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
131 main (int argc, char *argv[])
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);
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
143 persist = galeon_embed_persist_new (popup->priv->embed);
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 (),
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
155 GList *retList = NULL;
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",
162 GDir *dir = g_dir_open(path, 0, NULL);
164 gchar *utf8_path = NULL;
165 gchar *filename = g_filename_from_utf8(sheetfile, -1,
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",
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
178 /* build the filename */
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 "history.xml", NULL);
183 /* build the initial history hash table */
188 - histfile = g_build_filename (g_get_home_dir (),
189 + histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
193 diff -urN aa/galeon-1.3.17/galeon-config-tool.in galeon-1.3.17/galeon-config-tool.in
194 --- aa/galeon-1.3.17/galeon-config-tool.in 2002-03-14 08:40:24.000000000 +0100
195 +++ galeon-1.3.17/galeon-config-tool.in 2004-08-10 15:09:14.144273928 +0200
197 echo "Removing $HOME/.gnome/accels/galeon"
198 rm -rf $HOME/.gnome/accels/galeon
200 + if [ -n "$HOME_ETC" ]; then
201 + echo "Removing $HOME_ETC/.galeon"
202 + rm -rf $HOME_ETC/.galeon
204 + echo "Removing $HOME_ETC/.gconf/apps/galeon"
205 + rm -rf $HOME_ETC/.gconf/apps/galeon
207 + echo "Removing $HOME_ETC/.gnome/galeon"
208 + rm -rf $HOME_ETC/.gnome/galeon
210 + echo "Removing $HOME_ETC/.gnome/accels/galeon"
211 + rm -rf $HOME_ETC/.gnome/accels/galeon
218 diff -urN aa/galeon-1.3.17/libegg/egg-recent-model.c galeon-1.3.17/libegg/egg-recent-model.c
219 --- aa/galeon-1.3.17/libegg/egg-recent-model.c 2004-08-07 10:05:12.000000000 +0200
220 +++ galeon-1.3.17/libegg/egg-recent-model.c 2004-08-10 15:05:37.258245616 +0200
221 @@ -1155,7 +1155,7 @@
222 model->priv = g_new0 (EggRecentModelPrivate, 1);
224 model->priv->path = g_strdup_printf ("%s" EGG_RECENT_MODEL_FILE_PATH,
225 - g_get_home_dir ());
226 + getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ());
228 model->priv->mime_filter_values = NULL;
229 model->priv->group_filter_values = NULL;
230 diff -urN aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp galeon-1.3.17/mozilla/mozilla-embed-shell.cpp
231 --- aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp 2004-07-27 22:27:37.000000000 +0200
232 +++ galeon-1.3.17/mozilla/mozilla-embed-shell.cpp 2004-08-10 15:05:41.881542768 +0200
236 #include <glib/gi18n.h>
240 #include <nsIConsoleService.h>
242 mozilla_init_profile (void)
245 - profile_path = g_build_filename (g_get_home_dir (),
246 + profile_path = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
249 gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
250 diff -urN aa/galeon-1.3.17/mozilla/ProgressListener.cpp galeon-1.3.17/mozilla/ProgressListener.cpp
251 --- aa/galeon-1.3.17/mozilla/ProgressListener.cpp 2004-08-01 23:43:02.000000000 +0200
252 +++ galeon-1.3.17/mozilla/ProgressListener.cpp 2004-08-10 15:05:55.201517824 +0200
254 !g_file_test (dirName, G_FILE_TEST_IS_DIR))
257 - dirName = g_strdup (g_get_home_dir ());
258 + dirName = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ());
262 diff -urN aa/galeon-1.3.17/src/galeon-favicon-cache.c galeon-1.3.17/src/galeon-favicon-cache.c
263 --- aa/galeon-1.3.17/src/galeon-favicon-cache.c 2004-06-06 14:42:30.000000000 +0200
264 +++ galeon-1.3.17/src/galeon-favicon-cache.c 2004-08-10 15:06:24.383081552 +0200
265 @@ -134,11 +134,11 @@
266 (GDestroyNotify) g_free,
267 (GDestroyNotify) g_object_unref);
269 - cache->priv->filename = g_build_filename (g_get_home_dir (),
270 + cache->priv->filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
274 - cache->priv->directory = g_build_filename (g_get_home_dir (),
275 + cache->priv->directory = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
279 diff -urN aa/galeon-1.3.17/src/galeon-shell.c galeon-1.3.17/src/galeon-shell.c
280 --- aa/galeon-1.3.17/src/galeon-shell.c 2004-07-29 21:33:16.000000000 +0200
281 +++ galeon-1.3.17/src/galeon-shell.c 2004-08-10 15:06:12.927823016 +0200
284 if (gs->priv->toolbars_model)
286 - gchar *tb_file = g_build_filename (g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
287 + gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
288 egg_toolbars_model_save (gs->priv->toolbars_model, tb_file, "0");
290 g_object_unref (gs->priv->toolbars_model);
293 /* this is temp code, I need to think about how to properly initialize bookmarks */
294 GbXBEL *io = gb_xbel_new ();
295 - gchar *filename = g_strconcat (g_get_home_dir (), "/",
296 + gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), "/",
297 GALEON_DIR "/bookmarks.xbel", NULL);
299 /* init the bookmark icon provider */
300 diff -urN galeon-1.3.19/src/galeon-sidebars.c.orig galeon-1.3.19/src/galeon-sidebars.c
301 --- galeon-1.3.19/src/galeon-sidebars.c.orig 2005-02-26 15:08:49.201988840 +0100
302 +++ galeon-1.3.19/src/galeon-sidebars.c 2005-02-26 15:09:15.635970264 +0100
307 - sidebars->priv->filename = g_build_filename(g_get_home_dir(),
308 + sidebars->priv->filename = g_build_filename(getenv("HOME_ETC")!=NULL? getenv("HOME_ETC"): g_get_home_dir(),
309 GALEON_DIR"/sidebars.xml",
311 galeon_sidebars_load (sidebars);
312 diff -urN aa/galeon-1.3.17/src/migrate.c galeon-1.3.17/src/migrate.c
313 --- aa/galeon-1.3.17/src/migrate.c 2004-07-04 11:41:53.000000000 +0200
314 +++ galeon-1.3.17/src/migrate.c 2004-08-10 15:06:50.993036224 +0200
319 - gchar *tb_file = g_build_filename (g_get_home_dir (),
320 + gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
321 GALEON_DIR, "toolbars.xml", NULL);
324 diff -urN aa/galeon-1.3.17/src/popup-commands.c galeon-1.3.17/src/popup-commands.c
325 --- aa/galeon-1.3.17/src/popup-commands.c 2004-08-07 19:09:26.000000000 +0200
326 +++ galeon-1.3.17/src/popup-commands.c 2004-08-10 15:06:29.432313952 +0200
328 persist = galeon_embed_persist_new (embed);
330 base = g_path_get_basename (location);
331 - dest = g_build_filename (g_get_home_dir (),
332 + dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
336 diff -urN aa/galeon-1.3.17/src/session.c galeon-1.3.17/src/session.c
337 --- aa/galeon-1.3.17/src/session.c 2004-06-06 14:42:30.000000000 +0200
338 +++ galeon-1.3.17/src/session.c 2004-08-10 15:06:44.638002336 +0200
339 @@ -171,14 +171,14 @@
341 if (strcmp (filename, SESSION_SAVED) == 0)
343 - save_to = g_build_filename (g_get_home_dir (),
344 + save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
349 else if (strcmp (filename, SESSION_CRASHED) == 0)
351 - save_to = g_build_filename (g_get_home_dir (),
352 + save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
354 "session_crashed.xml",
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 (),
363 "session_gnome-XXXXXX",
365 diff -urN aa/galeon-1.3.17/utils/gul-download.c galeon-1.3.17/utils/gul-download.c
366 --- aa/galeon-1.3.17/utils/gul-download.c 2004-03-30 23:33:06.000000000 +0200
367 +++ galeon-1.3.17/utils/gul-download.c 2004-08-10 15:07:00.277624752 +0200
369 prefDir = eel_gconf_get_string(CONF_DOWNLOADING_DIR);
372 - prefDir = g_strdup (g_get_home_dir());
373 + prefDir = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
375 utf8DirName = g_strconcat(prefDir, "/", NULL);
381 - utf8ExpDir = g_strdup(g_get_home_dir());
382 + utf8ExpDir = g_strdup(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
385 /* Dirname must be locale encoded as explained above */
386 diff -urN aa/galeon-1.3.17/utils/gul-file-chooser.c galeon-1.3.17/utils/gul-file-chooser.c
387 --- aa/galeon-1.3.17/utils/gul-file-chooser.c 2004-07-18 21:23:36.000000000 +0200
388 +++ galeon-1.3.17/utils/gul-file-chooser.c 2004-08-10 15:07:17.510005032 +0200
389 @@ -311,18 +311,18 @@
392 if (download_dir != NULL &&
393 - !str_is_equal (download_dir, g_get_home_dir ()))
394 + !str_is_equal (download_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()))
396 gtk_file_chooser_add_shortcut_folder (chooser, download_dir, NULL);
398 if (upload_dir != NULL &&
399 - !str_is_equal (upload_dir, g_get_home_dir ()) &&
400 + !str_is_equal (upload_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()) &&
401 !str_is_equal (upload_dir, download_dir))
403 gtk_file_chooser_add_shortcut_folder (chooser, upload_dir, NULL);
405 if (open_dir != NULL &&
406 - !str_is_equal (open_dir, g_get_home_dir ()) &&
407 + !str_is_equal (open_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()) &&
408 !str_is_equal (open_dir, download_dir) &&
409 !str_is_equal (open_dir, upload_dir))
411 diff -urN aa/galeon-1.3.17/utils/gul-general.c galeon-1.3.17/utils/gul-general.c
412 --- aa/galeon-1.3.17/utils/gul-general.c 2004-03-30 23:33:06.000000000 +0200
413 +++ galeon-1.3.17/utils/gul-general.c 2004-08-10 15:07:06.053746648 +0200
417 /* try the default */
418 - file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL);
419 + file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, fname, NULL);
422 if (g_file_test (file, G_FILE_TEST_EXISTS))
423 diff -urN aa/galeon-1.3.17/utils/gul-state.c galeon-1.3.17/utils/gul-state.c
424 --- aa/galeon-1.3.17/utils/gul-state.c 2004-03-29 23:55:56.000000000 +0200
425 +++ galeon-1.3.17/utils/gul-state.c 2004-08-10 15:07:22.590232720 +0200
429 /* Using ~/.galeon/state.ini to keep all files together. */
430 - filename = g_build_filename (g_get_home_dir(),
431 + filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
432 ".galeon", "state.ini", NULL);
435 diff -urN aa/galeon-1.3.17/utils/gul-string.c galeon-1.3.17/utils/gul-string.c
436 --- aa/galeon-1.3.17/utils/gul-string.c 2004-03-30 23:33:06.000000000 +0200
437 +++ galeon-1.3.17/utils/gul-string.c 2004-08-10 15:07:29.456188936 +0200
439 if (!str) return NULL;
440 if (str[0] != '~') return g_strdup (str);
442 - return g_strconcat (g_get_home_dir (), str + 1, NULL);
443 + return g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), str + 1, NULL);