]> git.pld-linux.org Git - packages/galeon.git/blame - galeon-home_etc.patch
projects / packages / galeon.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- converted to UTF-8
[packages/galeon.git] / galeon-home_etc.patch
CommitLineData
a82fc531 1diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-konqueror.c galeon-1.3.13a/bookmarks/bookmarks-export-druid-konqueror.c
2--- aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-konqueror.c 2002-09-11 20:22:54.000000000 +0200
3+++ galeon-1.3.13a/bookmarks/bookmarks-export-druid-konqueror.c 2004-03-20 18:24:51.152443440 +0100
4@@ -133,29 +133,30 @@
5 GSList *l;
6 GSList *ret = NULL;
7 gchar *dir;
8+ gchar *home_etc = getenv("HOME_ETC");
9
10- dir = g_build_filename (g_get_home_dir (), ".kde", NULL);
11+ dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), ".kde", NULL);
12 l = gul_find_file (dir, "bookmarks.xbel", 5);
13 ret = g_slist_concat (ret, l);
14 l = gul_find_file (dir, "bookmarks.xml", 5);
15 ret = g_slist_concat (ret, l);
16 g_free (dir);
17
18- dir = g_build_filename (g_get_home_dir (), ".kde2", NULL);
19+ dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), ".kde2", NULL);
20 l = gul_find_file (dir, "bookmarks.xbel", 5);
21 ret = g_slist_concat (ret, l);
22 l = gul_find_file (dir, "bookmarks.xml", 5);
23 ret = g_slist_concat (ret, l);
24 g_free (dir);
25
26- dir = g_build_filename (g_get_home_dir (), ".kde3", NULL);
27+ dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), ".kde3", NULL);
28 l = gul_find_file (dir, "bookmarks.xbel", 5);
29 ret = g_slist_concat (ret, l);
30 l = gul_find_file (dir, "bookmarks.xml", 5);
31 ret = g_slist_concat (ret, l);
32 g_free (dir);
33
34- dir = g_build_filename (g_get_home_dir (), ".konqueror", NULL);
35+ dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), ".konqueror", NULL);
36 l = gul_find_file (dir, "bookmarks.xbel", 5);
37 ret = g_slist_concat (ret, l);
38 l = gul_find_file (dir, "bookmarks.xml", 5);
39@@ -165,7 +166,7 @@
40 {
41 /* give a default */
42 ret = g_slist_prepend
43- (ret, g_build_filename (g_get_home_dir (),
44+ (ret, g_build_filename (home_etc ? home_etc : g_get_home_dir (),
45 ".kde/share/apps/konqueror/bookmarks.xml", NULL));
46 }
47
48diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-mozilla.c galeon-1.3.13a/bookmarks/bookmarks-export-druid-mozilla.c
49--- aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-mozilla.c 2002-09-11 20:22:54.000000000 +0200
50+++ galeon-1.3.13a/bookmarks/bookmarks-export-druid-mozilla.c 2004-03-20 18:25:30.731426520 +0100
51@@ -131,7 +131,7 @@
52 gb_export_druid_mozilla_get_locations_impl (GbExportDruid *druid)
53 {
54 GSList *l;
55- gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL);
56+ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".mozilla", NULL);
57 l = gul_find_file (dir, "bookmarks.html", 4);
58 if (l == NULL)
59 {
60diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-netscape.c galeon-1.3.13a/bookmarks/bookmarks-export-druid-netscape.c
61--- aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-netscape.c 2002-09-11 20:22:54.000000000 +0200
62+++ galeon-1.3.13a/bookmarks/bookmarks-export-druid-netscape.c 2004-03-20 18:25:45.674154880 +0100
63@@ -131,7 +131,7 @@
64 gb_export_druid_netscape_get_locations_impl (GbExportDruid *druid)
65 {
66 GSList *l;
67- gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL);
68+ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".netscape", NULL);
69 l = gul_find_file (dir, "bookmarks.html", 4);
70 if (l == NULL)
71 {
72diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-epiphany.c galeon-1.3.13a/bookmarks/bookmarks-import-druid-epiphany.c
73--- aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-epiphany.c 2003-12-19 00:42:19.000000000 +0100
74+++ galeon-1.3.13a/bookmarks/bookmarks-import-druid-epiphany.c 2004-03-20 18:26:03.695415232 +0100
75@@ -140,7 +140,7 @@
76 GSList *l;
77 gchar *dir;
78
79- dir = g_build_filename (g_get_home_dir (),
80+ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
81 GNOME_DOT_GNOME,
82 "epiphany",
83 NULL);
84diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.13a/bookmarks/bookmarks-import-druid-konqueror.c
85--- aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-konqueror.c 2004-03-20 17:43:20.000000000 +0100
86+++ galeon-1.3.13a/bookmarks/bookmarks-import-druid-konqueror.c 2004-03-20 18:26:53.570833016 +0100
d5c2eeb0 87@@ -134,6 +134,7 @@
88 GSList *ret = NULL;
89 gchar *dir;
90 gchar *fname;
91+ gchar *home_etc = getenv("HOME_ETC");
92 guint i;
93
94 static const gchar *galeon_dirs[] = { ".galeon", ".galeon1" , ".galeon2" };
95@@ -143,7 +144,7 @@
96 for (i = 0; i < G_N_ELEMENTS (galeon_dirs); ++i)
97 {
a82fc531 98 guint j;
d5c2eeb0 99- dir = g_build_filename (g_get_home_dir (), galeon_dirs[i], NULL);
100+ dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), galeon_dirs[i], NULL);
101 l = gul_find_file (dir, "bookmarks.xbel", 5);
102 ret = g_slist_concat (ret, l);
103 for (j = 0; j < 10; ++j)
a82fc531 104@@ -162,7 +163,7 @@
105 /* konqueror locations */
106 for (i = 0; i < G_N_ELEMENTS (kde_dirs); ++i)
107 {
108- dir = g_build_filename (g_get_home_dir (), kde_dirs[i], NULL);
109+ dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), kde_dirs[i], NULL);
110 l = gul_find_file (dir, "bookmarks.xbel", 5);
111 ret = g_slist_concat (ret, l);
112 l = gul_find_file (dir, "bookmarks.xml", 5);
113diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-mozilla.c galeon-1.3.13a/bookmarks/bookmarks-import-druid-mozilla.c
114--- aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-mozilla.c 2002-09-11 20:22:54.000000000 +0200
115+++ galeon-1.3.13a/bookmarks/bookmarks-import-druid-mozilla.c 2004-03-20 18:27:04.138226528 +0100
116@@ -131,7 +131,7 @@
117 gb_import_druid_mozilla_get_locations_impl (GbImportDruid *druid)
118 {
119 GSList *l;
120- gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL);
121+ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".mozilla", NULL);
122 l = gul_find_file (dir, "bookmarks.html", 4);
123 g_free (dir);
124 return l;
125diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-netscape.c galeon-1.3.13a/bookmarks/bookmarks-import-druid-netscape.c
126--- aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-netscape.c 2002-09-11 20:22:54.000000000 +0200
127+++ galeon-1.3.13a/bookmarks/bookmarks-import-druid-netscape.c 2004-03-20 18:27:14.527647096 +0100
128@@ -131,7 +131,7 @@
129 gb_import_druid_netscape_get_locations_impl (GbImportDruid *druid)
130 {
131 GSList *l;
132- gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL);
133+ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".netscape", NULL);
134 l = gul_find_file (dir, "bookmarks.html", 4);
135 g_free (dir);
136 return l;
137diff -urN aa/galeon-1.3.13a/bookmarks/testbookmarks.c galeon-1.3.13a/bookmarks/testbookmarks.c
138--- aa/galeon-1.3.13a/bookmarks/testbookmarks.c 2002-07-23 14:06:55.000000000 +0200
139+++ galeon-1.3.13a/bookmarks/testbookmarks.c 2004-03-20 18:22:38.727575080 +0100
140@@ -133,7 +133,7 @@
d5c2eeb0 141 main (int argc, char *argv[])
142 {
d5c2eeb0 143 gchar *filename = argc == 2 ? argv[1]
144- : g_strconcat (g_get_home_dir (),
a82fc531 145+ : g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
d5c2eeb0 146 "/.galeon/bookmarks.xbel", NULL);
147 GbBookmarkSet *set;
148 GbFolder *folder1, *folder2, *r;
a82fc531 149diff -urN aa/galeon-1.3.13a/embed/galeon-embed-popup.c galeon-1.3.13a/embed/galeon-embed-popup.c
150--- aa/galeon-1.3.13a/embed/galeon-embed-popup.c 2004-03-20 17:43:36.000000000 +0100
151+++ galeon-1.3.13a/embed/galeon-embed-popup.c 2004-03-20 18:28:09.983216568 +0100
152@@ -657,7 +657,7 @@
153 persist = galeon_embed_persist_new (popup->priv->embed);
154
155 base = g_path_get_basename (location);
156- dest = g_build_filename (g_get_home_dir (),
157+ dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
158 GALEON_DIR,
159 base, NULL);
160
161diff -urN aa/galeon-1.3.13a/embed/galeon-embed-utils.c galeon-1.3.13a/embed/galeon-embed-utils.c
162--- aa/galeon-1.3.13a/embed/galeon-embed-utils.c 2004-03-20 17:43:36.000000000 +0100
163+++ galeon-1.3.13a/embed/galeon-embed-utils.c 2004-03-20 18:28:24.762969704 +0100
164@@ -113,7 +113,7 @@
165 if (!dirName || dirName[0] == '\0')
166 {
167 g_free (dirName);
168- dirName = g_strdup (g_get_home_dir ());
169+ dirName = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ());
170 }
171 else
d5c2eeb0 172 {
a82fc531 173diff -urN aa/galeon-1.3.13a/embed/global-history.c galeon-1.3.13a/embed/global-history.c
174--- aa/galeon-1.3.13a/embed/global-history.c 2004-03-20 17:43:36.000000000 +0100
175+++ galeon-1.3.13a/embed/global-history.c 2004-03-20 18:28:55.182345256 +0100
176@@ -358,7 +358,7 @@
d5c2eeb0 177 gchar *histfile;
178
179 /* build the filename */
180- histfile = g_build_filename (g_get_home_dir (), GALEON_DIR,
a82fc531 181+ histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR,
d5c2eeb0 182 "history.xml", NULL);
183
184 /* build the initial history hash table */
a82fc531 185@@ -564,7 +564,7 @@
d5c2eeb0 186 return;
187 }
188
189- histfile = g_build_filename (g_get_home_dir (),
a82fc531 190+ histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
d5c2eeb0 191 GALEON_DIR,
192 "history.xml",
193 NULL);
a82fc531 194diff -urN aa/galeon-1.3.13a/galeon-config-tool.in galeon-1.3.13a/galeon-config-tool.in
195--- aa/galeon-1.3.13a/galeon-config-tool.in 2002-03-14 08:40:24.000000000 +0100
196+++ galeon-1.3.13a/galeon-config-tool.in 2004-03-20 18:37:51.238852280 +0100
d5c2eeb0 197@@ -44,6 +44,21 @@
198 echo "Removing $HOME/.gnome/accels/galeon"
199 rm -rf $HOME/.gnome/accels/galeon
200
201+ if [ -n "$HOME_ETC" ]; then
a82fc531 202+ echo "Removing $HOME_ETC/.galeon"
203+ rm -rf $HOME_ETC/.galeon
d5c2eeb0 204+
a82fc531 205+ echo "Removing $HOME_ETC/.gconf/apps/galeon"
206+ rm -rf $HOME_ETC/.gconf/apps/galeon
d5c2eeb0 207+
a82fc531 208+ echo "Removing $HOME_ETC/.gnome/galeon"
209+ rm -rf $HOME_ETC/.gnome/galeon
d5c2eeb0 210+
a82fc531 211+ echo "Removing $HOME_ETC/.gnome/accels/galeon"
212+ rm -rf $HOME_ETC/.gnome/accels/galeon
213+
d5c2eeb0 214+ fi
215+
216 echo "...Done."
217
218 else
a82fc531 219diff -urN aa/galeon-1.3.13a/mozilla/ContentHandler.cpp galeon-1.3.13a/mozilla/ContentHandler.cpp
220--- aa/galeon-1.3.13a/mozilla/ContentHandler.cpp 2004-03-20 17:43:37.000000000 +0100
221+++ galeon-1.3.13a/mozilla/ContentHandler.cpp 2004-03-20 18:39:44.462639648 +0100
222@@ -305,6 +305,7 @@
223 nsILocalFile **_retval)
224 {
225 nsresult rv;
226+ gchar *home_etc = getenv("HOME_ETC");
227
228 mContext = aWindowContext;
229
230@@ -329,7 +330,7 @@
231 if (!dirName || dirName[0] == '\0')
232 {
233 g_free (dirName);
234- dirName = g_strdup (g_get_home_dir ());
235+ dirName = g_strdup (home_etc ? home_etc : g_get_home_dir ());
236 }
237 else
238 {
239@@ -349,7 +350,7 @@
240 !g_file_test (expanded_directory, G_FILE_TEST_IS_DIR))
241 {
242 g_free (expanded_directory);
243- expanded_directory = g_strdup (g_get_home_dir());
244+ expanded_directory = g_strdup (home_etc ? home_etc : g_get_home_dir());
245 }
246
247 nsCOMPtr<nsILocalFile> saveDir = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
248diff -urN aa/galeon-1.3.13a/mozilla/FilePicker.cpp galeon-1.3.13a/mozilla/FilePicker.cpp
249--- aa/galeon-1.3.13a/mozilla/FilePicker.cpp 2004-03-20 17:43:37.000000000 +0100
250+++ galeon-1.3.13a/mozilla/FilePicker.cpp 2004-03-20 18:30:33.183446824 +0100
251@@ -94,7 +94,7 @@
252 if (!dirName || dirName[0] == '\0')
253 {
254 g_free (dirName);
255- dirName = g_filename_to_utf8 (g_get_home_dir(), -1,
256+ dirName = g_filename_to_utf8 (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(), -1,
257 NULL, NULL, NULL);
258 }
259
260diff -urN aa/galeon-1.3.13a/mozilla/mozilla-embed-shell.cpp galeon-1.3.13a/mozilla/mozilla-embed-shell.cpp
261--- aa/galeon-1.3.13a/mozilla/mozilla-embed-shell.cpp 2004-03-20 17:43:37.000000000 +0100
262+++ galeon-1.3.13a/mozilla/mozilla-embed-shell.cpp 2004-03-20 18:31:48.876939664 +0100
263@@ -336,7 +336,7 @@
d5c2eeb0 264 mozilla_init_profile (void)
265 {
266 char *profile_path;
267- profile_path = g_build_filename (g_get_home_dir (),
a82fc531 268+ profile_path = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
d5c2eeb0 269 MOZILLA_PROFILE_DIR,
270 NULL);
271 gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
a82fc531 272@@ -1098,7 +1098,7 @@
273 !g_file_test (expanded_directory, G_FILE_TEST_IS_DIR))
274 {
275 if (expanded_directory) g_free (expanded_directory);
276- expanded_directory = g_strdup (g_get_home_dir());
277+ expanded_directory = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
278 }
d5c2eeb0 279
a82fc531 280 nsCOMPtr<nsILocalFile> dir =
281diff -urN aa/galeon-1.3.13a/mozilla/MyportalProtocolHandler.cpp galeon-1.3.13a/mozilla/MyportalProtocolHandler.cpp
282--- aa/galeon-1.3.13a/mozilla/MyportalProtocolHandler.cpp 2004-03-20 17:43:37.000000000 +0100
283+++ galeon-1.3.13a/mozilla/MyportalProtocolHandler.cpp 2004-03-20 18:30:44.579714328 +0100
284@@ -205,7 +205,7 @@
d5c2eeb0 285
286 /* open the rendering stream */
287 #if USE_INTERMEDIATE_FILE
288- gchar *filename = g_strconcat (g_get_home_dir (),
a82fc531 289+ gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
d5c2eeb0 290 "/.galeon/myportal.html",
291 NULL);
292 gchar *myportalURI = g_strconcat ("file://",filename, NULL);
a82fc531 293diff -urN aa/galeon-1.3.13a/mozilla/PrintProgressListener.cpp galeon-1.3.13a/mozilla/PrintProgressListener.cpp
294--- aa/galeon-1.3.13a/mozilla/PrintProgressListener.cpp 2002-05-27 03:36:44.000000000 +0200
295+++ galeon-1.3.13a/mozilla/PrintProgressListener.cpp 2004-03-20 19:06:21.690824056 +0100
296@@ -20,6 +20,7 @@
297
298 /* see the FIXME below */
299 #include <locale.h>
300+#include <stdlib.h>
301
302 #include <libgnome/gnome-exec.h>
303
304@@ -68,7 +69,7 @@
305 {
306 command = g_strconcat (app->command, " ",
307 mFilename, NULL);
308- gnome_execute_shell (g_get_home_dir(), command);
309+ gnome_execute_shell (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(), command);
310 gnome_vfs_mime_application_free (app);
311 g_free (command);
312 }
313diff -urN aa/galeon-1.3.13a/mozilla/SideBar.cpp galeon-1.3.13a/mozilla/SideBar.cpp
314--- aa/galeon-1.3.13a/mozilla/SideBar.cpp 2004-03-20 17:43:37.000000000 +0100
315+++ galeon-1.3.13a/mozilla/SideBar.cpp 2004-03-20 18:31:23.398812928 +0100
316@@ -262,7 +262,7 @@
d5c2eeb0 317
318 void GSidebar::LoadSidebarPages(void)
319 {
320- gchar *filename = g_build_filename(g_get_home_dir(),
a82fc531 321+ gchar *filename = g_build_filename(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
d5c2eeb0 322 GALEON_DIR"/sidebars.xml",
323 NULL);
324
a82fc531 325@@ -307,7 +307,7 @@
d5c2eeb0 326
327 void GSidebar::SaveSidebarPages(void)
328 {
329- gchar *filename = g_build_filename (g_get_home_dir(),
a82fc531 330+ gchar *filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
d5c2eeb0 331 GALEON_DIR"/sidebars.xml",
332 NULL);
333
a82fc531 334diff -urN aa/galeon-1.3.13a/src/galeon-favicon-cache.c galeon-1.3.13a/src/galeon-favicon-cache.c
335--- aa/galeon-1.3.13a/src/galeon-favicon-cache.c 2004-03-20 17:45:05.000000000 +0100
336+++ galeon-1.3.13a/src/galeon-favicon-cache.c 2004-03-20 18:33:55.330715768 +0100
337@@ -116,6 +116,8 @@
d5c2eeb0 338 static void
339 galeon_favicon_cache_init (GaleonFaviconCache *cache)
340 {
341+ gchar *home_etc = getenv("HOME_ETC");
342+
343 cache->priv = g_new0 (GaleonFaviconCachePrivate, 1);
344
345 cache->priv->url_to_pixbuf = g_hash_table_new_full (g_str_hash,
a82fc531 346@@ -127,11 +129,11 @@
d5c2eeb0 347 (GDestroyNotify) g_free,
348 (GDestroyNotify) g_object_unref);
349
350- cache->priv->filename = g_build_filename (g_get_home_dir (),
351+ cache->priv->filename = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
352 GALEON_DIR,
353 "favicon_cache.xml",
354 NULL);
355- cache->priv->directory = g_build_filename (g_get_home_dir (),
356+ cache->priv->directory = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
357 GALEON_DIR,
358 "favicon_cache/",
359 NULL);
a82fc531 360diff -urN aa/galeon-1.3.13a/src/galeon-popup.c galeon-1.3.13a/src/galeon-popup.c
361--- aa/galeon-1.3.13a/src/galeon-popup.c 2004-03-20 17:45:06.000000000 +0100
362+++ galeon-1.3.13a/src/galeon-popup.c 2004-03-20 18:34:06.987943600 +0100
363@@ -902,7 +902,7 @@
364 persist = galeon_embed_persist_new (popup->priv->embed);
365
366 base = g_path_get_basename (location);
367- dest = g_build_filename (g_get_home_dir (),
368+ dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
369 GALEON_DIR,
370 base, NULL);
371
372diff -urN aa/galeon-1.3.13a/src/galeon-shell.c galeon-1.3.13a/src/galeon-shell.c
373--- aa/galeon-1.3.13a/src/galeon-shell.c 2004-03-20 17:45:06.000000000 +0100
374+++ galeon-1.3.13a/src/galeon-shell.c 2004-03-20 18:32:10.894592472 +0100
375@@ -312,7 +312,7 @@
376
377 if (gs->priv->toolbars_model)
378 {
379- gchar *tb_file = g_build_filename (g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
380+ gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
381 egg_toolbars_model_save (gs->priv->toolbars_model, tb_file, "0");
382 g_free (tb_file);
383 g_object_unref (gs->priv->toolbars_model);
384@@ -641,7 +641,7 @@
d5c2eeb0 385 {
386 /* this is temp code, I need to think about how to properly initialize bookmarks */
387 GbXBEL *io = gb_xbel_new ();
388- gchar *filename = g_strconcat (g_get_home_dir (), "/",
a82fc531 389+ gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), "/",
d5c2eeb0 390 GALEON_DIR "/bookmarks.xbel", NULL);
391
392 /* init the bookmark icon provider */
a82fc531 393diff -urN aa/galeon-1.3.13a/src/migrate.c galeon-1.3.13a/src/migrate.c
394--- aa/galeon-1.3.13a/src/migrate.c 2004-03-20 17:45:08.000000000 +0100
395+++ galeon-1.3.13a/src/migrate.c 2004-03-20 18:32:20.665107128 +0100
396@@ -247,7 +247,7 @@
397 static void
398 migrate_toolbar ()
399 {
400- gchar *tb_file = g_build_filename (g_get_home_dir (),
401+ gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
402 GALEON_DIR, "toolbars.xml", NULL);
403
404 gchar *toolbar;
405diff -urN aa/galeon-1.3.13a/src/session.c galeon-1.3.13a/src/session.c
406--- aa/galeon-1.3.13a/src/session.c 2004-03-20 17:45:09.000000000 +0100
407+++ galeon-1.3.13a/src/session.c 2004-03-20 18:33:09.863627816 +0100
d5c2eeb0 408@@ -160,19 +160,20 @@
409 get_session_filename (const char *filename)
410 {
411 char *save_to;
412+ char *home_etc = getenv("HOME_ETC");
413
414 g_return_val_if_fail (filename != NULL, NULL);
415
416 if (strcmp (filename, SESSION_SAVED) == 0)
417 {
418- save_to = g_build_filename (g_get_home_dir (),
419+ save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
420 GALEON_DIR,
421 "session_saved.xml",
422 NULL);
423 }
424 else if (strcmp (filename, SESSION_CRASHED) == 0)
425 {
426- save_to = g_build_filename (g_get_home_dir (),
427+ save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
428 GALEON_DIR,
429 "session_crashed.xml",
430 NULL);
431@@ -181,7 +182,7 @@
432 {
433 char *tmp;
434
435- save_to = g_build_filename (g_get_home_dir (),
436+ save_to = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
437 GALEON_DIR,
438 "session_gnome-XXXXXX",
439 NULL);
a82fc531 440diff -urN aa/galeon-1.3.13a/utils/gul-download.c galeon-1.3.13a/utils/gul-download.c
441--- aa/galeon-1.3.13a/utils/gul-download.c 2004-03-20 17:45:12.000000000 +0100
442+++ galeon-1.3.13a/utils/gul-download.c 2004-03-20 18:34:32.141119736 +0100
443@@ -74,7 +74,7 @@
444 prefDir = eel_gconf_get_string(CONF_DOWNLOADING_DIR);
445 if (!prefDir)
446 {
447- prefDir = g_strdup (g_get_home_dir());
448+ prefDir = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
449 }
450 utf8DirName = g_strconcat(prefDir, "/", NULL);
451 g_free(prefDir);
452@@ -179,7 +179,7 @@
453 }
454 else
455 {
456- utf8ExpDir = g_strdup(g_get_home_dir());
457+ utf8ExpDir = g_strdup(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
458 }
459
460 /* Dirname must be locale encoded as explained above */
461diff -urN aa/galeon-1.3.13a/utils/gul-general.c galeon-1.3.13a/utils/gul-general.c
462--- aa/galeon-1.3.13a/utils/gul-general.c 2004-03-20 17:45:12.000000000 +0100
463+++ galeon-1.3.13a/utils/gul-general.c 2004-03-20 18:34:43.654369456 +0100
464@@ -178,7 +178,7 @@
d5c2eeb0 465 }
466
467 /* try the default */
468- file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL);
a82fc531 469+ file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, fname, NULL);
d5c2eeb0 470
471 /* success? */
472 if (g_file_test (file, G_FILE_TEST_EXISTS))
a82fc531 473diff -urN aa/galeon-1.3.13a/utils/gul-state.c galeon-1.3.13a/utils/gul-state.c
474--- aa/galeon-1.3.13a/utils/gul-state.c 2004-03-20 17:45:12.000000000 +0100
475+++ galeon-1.3.13a/utils/gul-state.c 2004-03-20 18:34:54.791676328 +0100
476@@ -53,7 +53,7 @@
d5c2eeb0 477 char *config_prefix;
d5c2eeb0 478
479 /* Using ~/.galeon/state.ini to keep all files together. */
480- state_file = g_build_filename (g_get_home_dir(),
a82fc531 481+ state_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
d5c2eeb0 482 ".galeon", "state.ini", NULL);
483
484 config_prefix = g_strconcat ("=", state_file, "=/", NULL);
a82fc531 485diff -urN aa/galeon-1.3.13a/utils/gul-string.c galeon-1.3.13a/utils/gul-string.c
486--- aa/galeon-1.3.13a/utils/gul-string.c 2004-03-20 17:45:12.000000000 +0100
487+++ galeon-1.3.13a/utils/gul-string.c 2004-03-20 18:35:07.199790008 +0100
488@@ -315,7 +315,7 @@
489 if (!str) return NULL;
490 if (str[0] != '~') return g_strdup (str);
491
492- return g_strconcat (g_get_home_dir (), str + 1, NULL);
493+ return g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), str + 1, NULL);
494 }
495
496 int
Galeon - gecko-based GNOME web browser
This page took 0.145077 seconds and 4 git commands to generate.