-diff -Nru galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.10/bookmarks/bookmarks-import-druid-konqueror.c
---- galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c 2002-12-15 21:24:08.000000000 +0100
-+++ galeon-1.3.10/bookmarks/bookmarks-import-druid-konqueror.c 2003-11-13 12:26:57.000000000 +0100
-@@ -134,6 +134,7 @@
+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;
- gchar *fname;
-+ gchar *home_etc = getenv("HOME_ETC");
- guint i;
- static const gchar *galeon_dirs[] = { ".galeon", ".galeon1" , ".galeon2" };
-@@ -143,7 +144,7 @@
+- 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)
{
- uint j;
+ guint j;
- dir = g_build_filename (g_get_home_dir (), galeon_dirs[i], NULL);
-+ dir = g_build_filename (home_etc ? home_etc : 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)
-diff -Nru galeon-1.3.10.orig/bookmarks/testbookmarks.c galeon-1.3.10/bookmarks/testbookmarks.c
---- galeon-1.3.10.orig/bookmarks/testbookmarks.c 2002-07-23 14:06:55.000000000 +0200
-+++ galeon-1.3.10/bookmarks/testbookmarks.c 2003-11-13 12:26:57.000000000 +0100
-@@ -132,8 +132,9 @@
- int
+@@ -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 *home_etc = getenv("HOME_ETC");
gchar *filename = argc == 2 ? argv[1]
- : g_strconcat (g_get_home_dir (),
-+ : g_strconcat (home_etc ? home_etc : 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 -Nru galeon-1.3.10.orig/embed/global-history.c galeon-1.3.10/embed/global-history.c
---- galeon-1.3.10.orig/embed/global-history.c 2003-09-19 07:00:23.000000000 +0200
-+++ galeon-1.3.10/embed/global-history.c 2003-11-13 12:34:52.000000000 +0100
-@@ -389,6 +389,7 @@
- static void
- history_load (GlobalHistory *gh)
- {
-+ gchar *home_etc = getenv("HOME_ETC");
- /* definition of SAX parser for reading documents */
- static xmlSAXHandler parser =
- {
-@@ -421,7 +422,7 @@
- gchar *histfile;
-
- /* build the filename */
-- confdir = g_build_filename (g_get_home_dir (), GALEON_DIR, NULL);
-+ confdir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), GALEON_DIR, NULL);
- histfile = g_build_filename (confdir, "history.xml", NULL);
+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);
- /* build the initial history hash table */
-@@ -526,7 +527,8 @@
- static void
- history_save (GlobalHistoryPrivate *ghpriv)
+ 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 @@
{
-- gchar *histfile;
-+ gchar *histfile;
-+ gchar *home_etc = getenv("HOME_ETC");
- FILE *fp;
+ char *histfile;
- DEBUG_MSG (("saving history\n"));
-@@ -538,7 +540,7 @@
+- 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);
- DEBUG_MSG (("really\n"));
+- 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_strconcat (g_get_home_dir (),
-+ histfile = g_strconcat (home_etc ? home_etc : g_get_home_dir (),
- "/"GALEON_DIR"/history.xml", NULL);
- fp = fopen (histfile, "wb");
- g_free (histfile);
-diff -Nru galeon-1.3.10.orig/galeon-config-tool.in galeon-1.3.10/galeon-config-tool.in
---- galeon-1.3.10.orig/galeon-config-tool.in 2002-03-14 08:40:24.000000000 +0100
-+++ galeon-1.3.10/galeon-config-tool.in 2003-11-13 12:26:57.000000000 +0100
+- 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/.galeon"
++ rm -rf $HOME_ETC/.galeon
+
-+ echo "Removing $HOME_ETC/.gconf/apps/galeon"
-+ rm -rf $HOME_ETC/.gconf/apps/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/galeon"
++ rm -rf $HOME_ETC/.gnome/galeon
++
++ echo "Removing $HOME_ETC/.gnome/accels/galeon"
++ rm -rf $HOME_ETC/.gnome/accels/galeon
+
-+ echo "Removing $HOME_ETC/.gnome/accels/galeon"
-+ rm -rf $HOME_ETC/.gnome/accels/galeon
-+
+ fi
+
echo "...Done."
else
-diff -Nru galeon-1.3.10.orig/mozilla/mozilla-embed-shell.cpp galeon-1.3.10/mozilla/mozilla-embed-shell.cpp
---- galeon-1.3.10.orig/mozilla/mozilla-embed-shell.cpp 2003-09-25 05:36:35.000000000 +0200
-+++ galeon-1.3.10/mozilla/mozilla-embed-shell.cpp 2003-11-13 12:39:02.000000000 +0100
-@@ -331,7 +331,8 @@
+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 <time.h>
+ #include <glib/gi18n.h>
++#include <stdlib.h>
+ #include <string.h>
+
+ #include <nsIConsoleService.h>
+@@ -339,7 +339,7 @@
mozilla_init_profile (void)
{
char *profile_path;
- profile_path = g_build_filename (g_get_home_dir (),
-+ char *home_etc = getenv("HOME_ETC");
-+ profile_path = g_build_filename (home_etc ? home_etc : 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 -Nru galeon-1.3.10.orig/mozilla/MyportalProtocolHandler.cpp galeon-1.3.10/mozilla/MyportalProtocolHandler.cpp
---- galeon-1.3.10.orig/mozilla/MyportalProtocolHandler.cpp 2003-09-15 02:48:24.000000000 +0200
-+++ galeon-1.3.10/mozilla/MyportalProtocolHandler.cpp 2003-11-13 12:26:57.000000000 +0100
-@@ -198,13 +198,14 @@
- NS_METHOD GMyportalProtocolHandler::CreateMyportalPage (const nsACString &path, nsIURI *aURI, nsIChannel **aChannel)
- {
- nsresult rv;
-+ char *home_etc = getenv("HOME_ETC");
-
- /* check bookmarks are loaded */
- // g_return_val_if_fail (bookmarks_root != NULL,NS_ERROR_FAILURE);
-
- /* open the rendering stream */
- #if USE_INTERMEDIATE_FILE
-- gchar *filename = g_strconcat (g_get_home_dir (),
-+ gchar *filename = g_strconcat (home_etc ? home_etc : g_get_home_dir (),
- "/.galeon/myportal.html",
- NULL);
- gchar *myportalURI = g_strconcat ("file://",filename, NULL);
-diff -Nru galeon-1.3.10.orig/mozilla/SideBar.cpp galeon-1.3.10/mozilla/SideBar.cpp
---- galeon-1.3.10.orig/mozilla/SideBar.cpp 2003-09-15 02:56:54.000000000 +0200
-+++ galeon-1.3.10/mozilla/SideBar.cpp 2003-11-13 12:36:30.000000000 +0100
-@@ -255,7 +255,8 @@
-
- void GSidebar::LoadSidebarPages(void)
- {
-- gchar *filename = g_build_filename(g_get_home_dir(),
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *filename = g_build_filename(home_etc ? home_etc : g_get_home_dir(),
- GALEON_DIR"/sidebars.xml",
- NULL);
-
-@@ -299,7 +300,8 @@
-
- void GSidebar::SaveSidebarPages(void)
- {
-- gchar *filename = g_build_filename (g_get_home_dir(),
-+ gchar *home_etc = getenv("HOME_ETC");
-+ gchar *filename = g_build_filename (home_etc ? home_etc : g_get_home_dir(),
- GALEON_DIR"/sidebars.xml",
- NULL);
+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 -Nru galeon-1.3.10.orig/src/galeon-favicon-cache.c galeon-1.3.10/src/galeon-favicon-cache.c
---- galeon-1.3.10.orig/src/galeon-favicon-cache.c 2003-09-05 03:01:53.000000000 +0200
-+++ galeon-1.3.10/src/galeon-favicon-cache.c 2003-11-13 12:26:57.000000000 +0100
-@@ -114,6 +114,8 @@
- static void
- galeon_favicon_cache_init (GaleonFaviconCache *cache)
- {
-+ gchar *home_etc = getenv("HOME_ETC");
-+
- cache->priv = g_new0 (GaleonFaviconCachePrivate, 1);
- cache->priv->url_to_pixbuf = g_hash_table_new_full (g_str_hash,
-@@ -125,11 +127,11 @@
+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 (home_etc ? home_etc : 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 (home_etc ? home_etc : 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 -Nru galeon-1.3.10.orig/src/galeon-shell.c galeon-1.3.10/src/galeon-shell.c
---- galeon-1.3.10.orig/src/galeon-shell.c 2003-10-13 23:56:13.000000000 +0200
-+++ galeon-1.3.10/src/galeon-shell.c 2003-11-13 12:26:57.000000000 +0100
-@@ -660,7 +660,8 @@
+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 *home_etc = getenv("HOME_ETC");
-+ gchar *filename = g_strconcat (home_etc ? home_etc : 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 -Nru galeon-1.3.10.orig/src/galeon-spinner.c galeon-1.3.10/src/galeon-spinner.c
---- galeon-1.3.10.orig/src/galeon-spinner.c 2003-09-09 01:26:56.000000000 +0200
-+++ galeon-1.3.10/src/galeon-spinner.c 2003-11-13 12:26:57.000000000 +0100
-@@ -827,8 +827,9 @@
- galeon_spinner_init_directory_list (void)
- {
- gchar *path;
-+ gchar *home_etc = getenv("HOME_ETC");
-
-- path = g_build_filename (g_get_home_dir (), GALEON_DIR, "spinners", NULL);
-+ path = g_build_filename (home_etc ? home_etc : g_get_home_dir (), GALEON_DIR, "spinners", NULL);
- spinner_directories = g_list_append (spinner_directories, path);
+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;
+
- path = g_build_filename (SHARE_DIR, "spinners", NULL);
-diff -Nru galeon-1.3.10.orig/src/session.c galeon-1.3.10/src/session.c
---- galeon-1.3.10.orig/src/session.c 2003-10-22 17:25:06.000000000 +0200
-+++ galeon-1.3.10/src/session.c 2003-11-13 12:26:57.000000000 +0100
-@@ -160,19 +160,20 @@
- get_session_filename (const char *filename)
+- 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 ()
{
- char *save_to;
-+ char *home_etc = getenv("HOME_ETC");
+- 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);
- g_return_val_if_fail (filename != NULL, 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 (home_etc ? home_etc : 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 (home_etc ? home_etc : 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);
-@@ -181,7 +182,7 @@
+@@ -187,7 +187,7 @@
{
char *tmp;
- save_to = g_build_filename (g_get_home_dir (),
-+ save_to = g_build_filename (home_etc ? home_etc : 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 -Nru galeon-1.3.10.orig/utils/gul-general.c galeon-1.3.10/utils/gul-general.c
---- galeon-1.3.10.orig/utils/gul-general.c 2003-09-08 20:51:28.000000000 +0200
-+++ galeon-1.3.10/utils/gul-general.c 2003-11-13 12:31:43.000000000 +0100
-@@ -75,6 +75,7 @@
- static GHashTable *already_found = NULL;
- gchar *alternative[6];
- gchar *file;
-+ gchar *home_etc = getenv("HOME_ETC");
- gint i;
-
- /* create cache hash table if it doesnt already exist */
-@@ -99,7 +100,7 @@
+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 (home_etc ? home_etc : 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 -Nru galeon-1.3.10.orig/utils/gul-state.c galeon-1.3.10/utils/gul-state.c
---- galeon-1.3.10.orig/utils/gul-state.c 2003-08-30 15:50:36.000000000 +0200
-+++ galeon-1.3.10/utils/gul-state.c 2003-11-13 12:26:57.000000000 +0100
-@@ -38,9 +38,10 @@
- {
- char *state_file;
- char *config_prefix;
-+ char *home_etc = getenv("HOME_ETC");
+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. */
-- state_file = g_build_filename (g_get_home_dir(),
-+ state_file = g_build_filename (home_etc ? home_etc : g_get_home_dir(),
- ".galeon", "state.ini", NULL);
+- 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);
+ }
- config_prefix = g_strconcat ("=", state_file, "=/", NULL);
+ int
projects / packages / galeon.git / blobdiff