1 diff -Nru galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.10/bookmarks/bookmarks-import-druid-konqueror.c
2 --- galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c 2002-12-15 21:24:08.000000000 +0100
3 +++ galeon-1.3.10/bookmarks/bookmarks-import-druid-konqueror.c 2003-11-13 12:26:57.000000000 +0100
8 + gchar *home_etc = getenv("HOME_ETC");
11 static const gchar *galeon_dirs[] = { ".galeon", ".galeon1" , ".galeon2" };
13 for (i = 0; i < G_N_ELEMENTS (galeon_dirs); ++i)
16 - dir = g_build_filename (g_get_home_dir (), galeon_dirs[i], NULL);
17 + dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), galeon_dirs[i], NULL);
18 l = gul_find_file (dir, "bookmarks.xbel", 5);
19 ret = g_slist_concat (ret, l);
20 for (j = 0; j < 10; ++j)
21 diff -Nru galeon-1.3.10.orig/bookmarks/testbookmarks.c galeon-1.3.10/bookmarks/testbookmarks.c
22 --- galeon-1.3.10.orig/bookmarks/testbookmarks.c 2002-07-23 14:06:55.000000000 +0200
23 +++ galeon-1.3.10/bookmarks/testbookmarks.c 2003-11-13 12:26:57.000000000 +0100
26 main (int argc, char *argv[])
28 + gchar *home_etc = getenv("HOME_ETC");
29 gchar *filename = argc == 2 ? argv[1]
30 - : g_strconcat (g_get_home_dir (),
31 + : g_strconcat (home_etc ? home_etc : g_get_home_dir (),
32 "/.galeon/bookmarks.xbel", NULL);
34 GbFolder *folder1, *folder2, *r;
35 diff -Nru galeon-1.3.10.orig/embed/global-history.c galeon-1.3.10/embed/global-history.c
36 --- galeon-1.3.10.orig/embed/global-history.c 2003-09-19 07:00:23.000000000 +0200
37 +++ galeon-1.3.10/embed/global-history.c 2003-11-13 12:34:52.000000000 +0100
40 history_load (GlobalHistory *gh)
42 + gchar *home_etc = getenv("HOME_ETC");
43 /* definition of SAX parser for reading documents */
44 static xmlSAXHandler parser =
49 /* build the filename */
50 - histfile = g_build_filename (g_get_home_dir (), GALEON_DIR,
51 + histfile = g_build_filename (home_etc ? home_etc : g_get_home_dir (), GALEON_DIR,
54 /* build the initial history hash table */
56 history_save (GlobalHistoryPrivate *ghpriv)
58 gchar *histfile, *tmpfile;
59 + gchar *home_etc = getenv("HOME_ETC");
67 - histfile = g_build_filename (g_get_home_dir (),
68 + histfile = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
72 diff -Nru galeon-1.3.10.orig/galeon-config-tool.in galeon-1.3.10/galeon-config-tool.in
73 --- galeon-1.3.10.orig/galeon-config-tool.in 2002-03-14 08:40:24.000000000 +0100
74 +++ galeon-1.3.10/galeon-config-tool.in 2003-11-13 12:26:57.000000000 +0100
76 echo "Removing $HOME/.gnome/accels/galeon"
77 rm -rf $HOME/.gnome/accels/galeon
79 + if [ -n "$HOME_ETC" ]; then
80 + echo "Removing $HOME_ETC/.galeon"
81 + rm -rf $HOME_ETC/.galeon
83 + echo "Removing $HOME_ETC/.gconf/apps/galeon"
84 + rm -rf $HOME_ETC/.gconf/apps/galeon
86 + echo "Removing $HOME_ETC/.gnome/galeon"
87 + rm -rf $HOME_ETC/.gnome/galeon
89 + echo "Removing $HOME_ETC/.gnome/accels/galeon"
90 + rm -rf $HOME_ETC/.gnome/accels/galeon
97 diff -Nru galeon-1.3.10.orig/mozilla/mozilla-embed-shell.cpp galeon-1.3.10/mozilla/mozilla-embed-shell.cpp
98 --- galeon-1.3.10.orig/mozilla/mozilla-embed-shell.cpp 2003-09-25 05:36:35.000000000 +0200
99 +++ galeon-1.3.10/mozilla/mozilla-embed-shell.cpp 2003-11-13 12:39:02.000000000 +0100
101 mozilla_init_profile (void)
104 - profile_path = g_build_filename (g_get_home_dir (),
105 + char *home_etc = getenv("HOME_ETC");
106 + profile_path = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
109 gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
110 diff -Nru galeon-1.3.10.orig/mozilla/MyportalProtocolHandler.cpp galeon-1.3.10/mozilla/MyportalProtocolHandler.cpp
111 --- galeon-1.3.10.orig/mozilla/MyportalProtocolHandler.cpp 2003-09-15 02:48:24.000000000 +0200
112 +++ galeon-1.3.10/mozilla/MyportalProtocolHandler.cpp 2003-11-13 12:26:57.000000000 +0100
113 @@ -198,13 +198,14 @@
114 NS_METHOD GMyportalProtocolHandler::CreateMyportalPage (const nsACString &path, nsIURI *aURI, nsIChannel **aChannel)
117 + char *home_etc = getenv("HOME_ETC");
119 /* check bookmarks are loaded */
120 // g_return_val_if_fail (bookmarks_root != NULL,NS_ERROR_FAILURE);
122 /* open the rendering stream */
123 #if USE_INTERMEDIATE_FILE
124 - gchar *filename = g_strconcat (g_get_home_dir (),
125 + gchar *filename = g_strconcat (home_etc ? home_etc : g_get_home_dir (),
126 "/.galeon/myportal.html",
128 gchar *myportalURI = g_strconcat ("file://",filename, NULL);
129 diff -Nru galeon-1.3.10.orig/mozilla/SideBar.cpp galeon-1.3.10/mozilla/SideBar.cpp
130 --- galeon-1.3.10.orig/mozilla/SideBar.cpp 2003-09-15 02:56:54.000000000 +0200
131 +++ galeon-1.3.10/mozilla/SideBar.cpp 2003-11-13 12:36:30.000000000 +0100
134 void GSidebar::LoadSidebarPages(void)
136 - gchar *filename = g_build_filename(g_get_home_dir(),
137 + gchar *home_etc = getenv("HOME_ETC");
138 + gchar *filename = g_build_filename(home_etc ? home_etc : g_get_home_dir(),
139 GALEON_DIR"/sidebars.xml",
144 void GSidebar::SaveSidebarPages(void)
146 - gchar *filename = g_build_filename (g_get_home_dir(),
147 + gchar *home_etc = getenv("HOME_ETC");
148 + gchar *filename = g_build_filename (home_etc ? home_etc : g_get_home_dir(),
149 GALEON_DIR"/sidebars.xml",
152 diff -Nru galeon-1.3.10.orig/src/galeon-favicon-cache.c galeon-1.3.10/src/galeon-favicon-cache.c
153 --- galeon-1.3.10.orig/src/galeon-favicon-cache.c 2003-09-05 03:01:53.000000000 +0200
154 +++ galeon-1.3.10/src/galeon-favicon-cache.c 2003-11-13 12:26:57.000000000 +0100
157 galeon_favicon_cache_init (GaleonFaviconCache *cache)
159 + gchar *home_etc = getenv("HOME_ETC");
161 cache->priv = g_new0 (GaleonFaviconCachePrivate, 1);
163 cache->priv->url_to_pixbuf = g_hash_table_new_full (g_str_hash,
164 @@ -125,11 +127,11 @@
165 (GDestroyNotify) g_free,
166 (GDestroyNotify) g_object_unref);
168 - cache->priv->filename = g_build_filename (g_get_home_dir (),
169 + cache->priv->filename = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
173 - cache->priv->directory = g_build_filename (g_get_home_dir (),
174 + cache->priv->directory = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
178 diff -Nru galeon-1.3.10.orig/src/galeon-shell.c galeon-1.3.10/src/galeon-shell.c
179 --- galeon-1.3.10.orig/src/galeon-shell.c 2003-10-13 23:56:13.000000000 +0200
180 +++ galeon-1.3.10/src/galeon-shell.c 2003-11-13 12:26:57.000000000 +0100
183 /* this is temp code, I need to think about how to properly initialize bookmarks */
184 GbXBEL *io = gb_xbel_new ();
185 - gchar *filename = g_strconcat (g_get_home_dir (), "/",
186 + gchar *home_etc = getenv("HOME_ETC");
187 + gchar *filename = g_strconcat (home_etc ? home_etc : g_get_home_dir (), "/",
188 GALEON_DIR "/bookmarks.xbel", NULL);
190 /* init the bookmark icon provider */
191 diff -Nru galeon-1.3.10.orig/src/session.c galeon-1.3.10/src/session.c
192 --- galeon-1.3.10.orig/src/session.c 2003-10-22 17:25:06.000000000 +0200
193 +++ galeon-1.3.10/src/session.c 2003-11-13 12:26:57.000000000 +0100
194 @@ -160,19 +160,20 @@
195 get_session_filename (const char *filename)
198 + char *home_etc = getenv("HOME_ETC");
200 g_return_val_if_fail (filename != NULL, NULL);
202 if (strcmp (filename, SESSION_SAVED) == 0)
204 - save_to = g_build_filename (g_get_home_dir (),
205 + save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
210 else if (strcmp (filename, SESSION_CRASHED) == 0)
212 - save_to = g_build_filename (g_get_home_dir (),
213 + save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
215 "session_crashed.xml",
221 - save_to = g_build_filename (g_get_home_dir (),
222 + save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
224 "session_gnome-XXXXXX",
226 diff -Nru galeon-1.3.10.orig/utils/gul-general.c galeon-1.3.10/utils/gul-general.c
227 --- galeon-1.3.10.orig/utils/gul-general.c 2003-09-08 20:51:28.000000000 +0200
228 +++ galeon-1.3.10/utils/gul-general.c 2003-11-13 12:31:43.000000000 +0100
230 static GHashTable *already_found = NULL;
231 gchar *alternative[6];
233 + gchar *home_etc = getenv("HOME_ETC");
236 /* create cache hash table if it doesnt already exist */
240 /* try the default */
241 - file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL);
242 + file = g_build_filename (home_etc ? home_etc : g_get_home_dir (), GALEON_DIR, fname, NULL);
245 if (g_file_test (file, G_FILE_TEST_EXISTS))
246 diff -Nru galeon-1.3.10.orig/utils/gul-state.c galeon-1.3.10/utils/gul-state.c
247 --- galeon-1.3.10.orig/utils/gul-state.c 2003-08-30 15:50:36.000000000 +0200
248 +++ galeon-1.3.10/utils/gul-state.c 2003-11-13 12:26:57.000000000 +0100
253 + char *home_etc = getenv("HOME_ETC");
255 /* Using ~/.galeon/state.ini to keep all files together. */
256 - state_file = g_build_filename (g_get_home_dir(),
257 + state_file = g_build_filename (home_etc ? home_etc : g_get_home_dir(),
258 ".galeon", "state.ini", NULL);
260 config_prefix = g_strconcat ("=", state_file, "=/", NULL);