]> 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
- rel. 3 to rebuild with mozilla 1.7.2
[packages/galeon.git] / galeon-home_etc.patch
CommitLineData
7982d49b 1diff -urN aa/galeon-1.3.15/bookmarks/bookmarks-export-druid-konqueror.c galeon-1.3.15/bookmarks/bookmarks-export-druid-konqueror.c
2--- aa/galeon-1.3.15/bookmarks/bookmarks-export-druid-konqueror.c 2004-03-30 23:33:05.000000000 +0200
3+++ galeon-1.3.15/bookmarks/bookmarks-export-druid-konqueror.c 2004-06-01 21:18:47.057848344 +0200
4@@ -134,28 +134,28 @@
da8ac9c7 5 GSList *ret = NULL;
6 gchar *dir;
da8ac9c7 7
8- dir = g_build_filename (g_get_home_dir (), ".kde", NULL);
7982d49b 9+ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".kde", NULL);
da8ac9c7 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);
7982d49b 17+ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".kde2", NULL);
da8ac9c7 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);
7982d49b 25+ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".kde3", NULL);
da8ac9c7 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);
7982d49b 33+ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".konqueror", NULL);
da8ac9c7 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);
7982d49b 37@@ -165,7 +165,7 @@
da8ac9c7 38 {
39 /* give a default */
40 ret = g_slist_prepend
41- (ret, g_build_filename (g_get_home_dir (),
7982d49b 42+ (ret, g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
da8ac9c7 43 ".kde/share/apps/konqueror/bookmarks.xml", NULL));
44 }
45
7982d49b 46diff -urN aa/galeon-1.3.15/bookmarks/bookmarks-export-druid-mozilla.c galeon-1.3.15/bookmarks/bookmarks-export-druid-mozilla.c
47--- aa/galeon-1.3.15/bookmarks/bookmarks-export-druid-mozilla.c 2004-03-30 23:33:05.000000000 +0200
48+++ galeon-1.3.15/bookmarks/bookmarks-export-druid-mozilla.c 2004-06-01 21:17:08.902770184 +0200
da8ac9c7 49@@ -131,7 +131,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 {
7982d49b 58diff -urN aa/galeon-1.3.15/bookmarks/bookmarks-export-druid-netscape.c galeon-1.3.15/bookmarks/bookmarks-export-druid-netscape.c
59--- aa/galeon-1.3.15/bookmarks/bookmarks-export-druid-netscape.c 2004-03-30 23:33:05.000000000 +0200
60+++ galeon-1.3.15/bookmarks/bookmarks-export-druid-netscape.c 2004-06-01 21:17:44.632338464 +0200
da8ac9c7 61@@ -131,7 +131,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 {
7982d49b 70diff -urN aa/galeon-1.3.15/bookmarks/bookmarks-import-druid-epiphany.c galeon-1.3.15/bookmarks/bookmarks-import-druid-epiphany.c
71--- aa/galeon-1.3.15/bookmarks/bookmarks-import-druid-epiphany.c 2004-03-30 23:33:05.000000000 +0200
72+++ galeon-1.3.15/bookmarks/bookmarks-import-druid-epiphany.c 2004-06-01 21:16:04.593546672 +0200
da8ac9c7 73@@ -140,7 +140,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);
7982d49b 82diff -urN aa/galeon-1.3.15/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.15/bookmarks/bookmarks-import-druid-konqueror.c
83--- aa/galeon-1.3.15/bookmarks/bookmarks-import-druid-konqueror.c 2004-03-30 23:33:05.000000000 +0200
84+++ galeon-1.3.15/bookmarks/bookmarks-import-druid-konqueror.c 2004-06-01 21:18:07.769821032 +0200
85@@ -143,7 +143,7 @@
1c13b742 86 for (i = 0; i < G_N_ELEMENTS (galeon_dirs); ++i)
87 {
da8ac9c7 88 guint j;
1c13b742 89- dir = g_build_filename (g_get_home_dir (), galeon_dirs[i], NULL);
7982d49b 90+ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), galeon_dirs[i], NULL);
1c13b742 91 l = gul_find_file (dir, "bookmarks.xbel", 5);
92 ret = g_slist_concat (ret, l);
93 for (j = 0; j < 10; ++j)
7982d49b 94@@ -162,7 +162,7 @@
da8ac9c7 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);
7982d49b 99+ dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), kde_dirs[i], NULL);
da8ac9c7 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);
7982d49b 103diff -urN aa/galeon-1.3.15/bookmarks/bookmarks-import-druid-mozilla.c galeon-1.3.15/bookmarks/bookmarks-import-druid-mozilla.c
104--- aa/galeon-1.3.15/bookmarks/bookmarks-import-druid-mozilla.c 2004-03-30 23:33:05.000000000 +0200
105+++ galeon-1.3.15/bookmarks/bookmarks-import-druid-mozilla.c 2004-06-01 21:16:33.788108424 +0200
da8ac9c7 106@@ -131,7 +131,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;
7982d49b 115diff -urN aa/galeon-1.3.15/bookmarks/bookmarks-import-druid-netscape.c galeon-1.3.15/bookmarks/bookmarks-import-druid-netscape.c
116--- aa/galeon-1.3.15/bookmarks/bookmarks-import-druid-netscape.c 2004-03-30 23:33:05.000000000 +0200
117+++ galeon-1.3.15/bookmarks/bookmarks-import-druid-netscape.c 2004-06-01 21:17:23.948482888 +0200
da8ac9c7 118@@ -131,7 +131,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;
7982d49b 127diff -urN aa/galeon-1.3.15/bookmarks/testbookmarks.c galeon-1.3.15/bookmarks/testbookmarks.c
128--- aa/galeon-1.3.15/bookmarks/testbookmarks.c 2002-07-23 14:06:55.000000000 +0200
129+++ galeon-1.3.15/bookmarks/testbookmarks.c 2004-06-01 21:19:08.485590832 +0200
da8ac9c7 130@@ -133,7 +133,7 @@
1c13b742 131 main (int argc, char *argv[])
132 {
1c13b742 133 gchar *filename = argc == 2 ? argv[1]
134- : g_strconcat (g_get_home_dir (),
da8ac9c7 135+ : g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 136 "/.galeon/bookmarks.xbel", NULL);
137 GbBookmarkSet *set;
138 GbFolder *folder1, *folder2, *r;
7982d49b 139diff -urN aa/galeon-1.3.15/embed/galeon-embed-popup.c galeon-1.3.15/embed/galeon-embed-popup.c
140--- aa/galeon-1.3.15/embed/galeon-embed-popup.c 2004-05-22 17:47:11.000000000 +0200
141+++ galeon-1.3.15/embed/galeon-embed-popup.c 2004-06-01 21:19:30.278277840 +0200
142@@ -656,7 +656,7 @@
da8ac9c7 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
7982d49b 151diff -urN aa/galeon-1.3.15/embed/galeon-embed-utils.c galeon-1.3.15/embed/galeon-embed-utils.c
152--- aa/galeon-1.3.15/embed/galeon-embed-utils.c 2004-05-22 17:47:11.000000000 +0200
153+++ galeon-1.3.15/embed/galeon-embed-utils.c 2004-06-01 21:19:44.530111232 +0200
154@@ -240,7 +240,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@@ -291,7 +291,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);
172diff -urN aa/galeon-1.3.15/embed/global-history.c galeon-1.3.15/embed/global-history.c
173--- aa/galeon-1.3.15/embed/global-history.c 2004-04-01 22:01:47.000000000 +0200
174+++ galeon-1.3.15/embed/global-history.c 2004-06-01 21:19:24.149209600 +0200
175@@ -356,7 +356,7 @@
1c13b742 176 gchar *histfile;
177
178 /* build the filename */
446d37ac 179- histfile = g_build_filename (g_get_home_dir (), GALEON_DIR,
da8ac9c7 180+ histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR,
446d37ac 181 "history.xml", NULL);
1c13b742 182
183 /* build the initial history hash table */
7982d49b 184@@ -504,7 +504,7 @@
446d37ac 185 return;
186 }
1c13b742 187
446d37ac 188- histfile = g_build_filename (g_get_home_dir (),
da8ac9c7 189+ histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
446d37ac 190 GALEON_DIR,
191 "history.xml",
192 NULL);
7982d49b 193diff -urN aa/galeon-1.3.15/galeon-config-tool.in galeon-1.3.15/galeon-config-tool.in
194--- aa/galeon-1.3.15/galeon-config-tool.in 2002-03-14 08:40:24.000000000 +0100
195+++ galeon-1.3.15/galeon-config-tool.in 2004-06-01 21:24:52.170342808 +0200
1c13b742 196@@ -44,6 +44,21 @@
197 echo "Removing $HOME/.gnome/accels/galeon"
198 rm -rf $HOME/.gnome/accels/galeon
199
200+ if [ -n "$HOME_ETC" ]; then
da8ac9c7 201+ echo "Removing $HOME_ETC/.galeon"
202+ rm -rf $HOME_ETC/.galeon
1c13b742 203+
da8ac9c7 204+ echo "Removing $HOME_ETC/.gconf/apps/galeon"
205+ rm -rf $HOME_ETC/.gconf/apps/galeon
1c13b742 206+
da8ac9c7 207+ echo "Removing $HOME_ETC/.gnome/galeon"
208+ rm -rf $HOME_ETC/.gnome/galeon
1c13b742 209+
da8ac9c7 210+ echo "Removing $HOME_ETC/.gnome/accels/galeon"
211+ rm -rf $HOME_ETC/.gnome/accels/galeon
7982d49b 212+
1c13b742 213+ fi
214+
215 echo "...Done."
216
217 else
7982d49b 218diff -urN aa/galeon-1.3.15/mozilla/mozilla-embed-shell.cpp galeon-1.3.15/mozilla/mozilla-embed-shell.cpp
219--- aa/galeon-1.3.15/mozilla/mozilla-embed-shell.cpp 2004-05-02 18:39:17.000000000 +0200
220+++ galeon-1.3.15/mozilla/mozilla-embed-shell.cpp 2004-06-01 21:19:50.459209872 +0200
221@@ -324,7 +324,7 @@
1c13b742 222 mozilla_init_profile (void)
223 {
224 char *profile_path;
225- profile_path = g_build_filename (g_get_home_dir (),
da8ac9c7 226+ profile_path = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 227 MOZILLA_PROFILE_DIR,
228 NULL);
229 gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
7982d49b 230diff -urN aa/galeon-1.3.15/mozilla/MyportalProtocolHandler.cpp galeon-1.3.15/mozilla/MyportalProtocolHandler.cpp
231--- aa/galeon-1.3.15/mozilla/MyportalProtocolHandler.cpp 2004-03-30 23:33:05.000000000 +0200
232+++ galeon-1.3.15/mozilla/MyportalProtocolHandler.cpp 2004-06-01 21:19:57.209183720 +0200
da8ac9c7 233@@ -205,7 +205,7 @@
1c13b742 234
235 /* open the rendering stream */
236 #if USE_INTERMEDIATE_FILE
237- gchar *filename = g_strconcat (g_get_home_dir (),
da8ac9c7 238+ gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 239 "/.galeon/myportal.html",
240 NULL);
241 gchar *myportalURI = g_strconcat ("file://",filename, NULL);
7982d49b 242diff -urN aa/galeon-1.3.15/mozilla/PrintProgressListener.cpp galeon-1.3.15/mozilla/PrintProgressListener.cpp
243--- aa/galeon-1.3.15/mozilla/PrintProgressListener.cpp 2002-05-27 03:36:44.000000000 +0200
244+++ galeon-1.3.15/mozilla/PrintProgressListener.cpp 2004-06-01 21:34:31.152324168 +0200
da8ac9c7 245@@ -20,6 +20,7 @@
246
247 /* see the FIXME below */
248 #include <locale.h>
249+#include <stdlib.h>
250
251 #include <libgnome/gnome-exec.h>
252
253@@ -68,7 +69,7 @@
254 {
255 command = g_strconcat (app->command, " ",
256 mFilename, NULL);
257- gnome_execute_shell (g_get_home_dir(), command);
258+ gnome_execute_shell (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(), command);
259 gnome_vfs_mime_application_free (app);
260 g_free (command);
261 }
7982d49b 262diff -urN aa/galeon-1.3.15/mozilla/ProgressListener.cpp galeon-1.3.15/mozilla/ProgressListener.cpp
263--- aa/galeon-1.3.15/mozilla/ProgressListener.cpp 2004-05-22 17:47:11.000000000 +0200
264+++ galeon-1.3.15/mozilla/ProgressListener.cpp 2004-06-01 21:20:13.728672376 +0200
265@@ -842,7 +842,7 @@
266 !g_file_test (dirName, G_FILE_TEST_IS_DIR))
267 {
268 g_free (dirName);
269- dirName = g_strdup (g_get_home_dir ());
270+ dirName = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ());
271 }
272
273
274diff -urN aa/galeon-1.3.15/mozilla/SideBar.cpp galeon-1.3.15/mozilla/SideBar.cpp
275--- aa/galeon-1.3.15/mozilla/SideBar.cpp 2004-03-16 22:49:10.000000000 +0100
276+++ galeon-1.3.15/mozilla/SideBar.cpp 2004-06-01 21:20:22.307368216 +0200
da8ac9c7 277@@ -262,7 +262,7 @@
1c13b742 278
279 void GSidebar::LoadSidebarPages(void)
280 {
281- gchar *filename = g_build_filename(g_get_home_dir(),
da8ac9c7 282+ gchar *filename = g_build_filename(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
1c13b742 283 GALEON_DIR"/sidebars.xml",
284 NULL);
285
da8ac9c7 286@@ -307,7 +307,7 @@
1c13b742 287
288 void GSidebar::SaveSidebarPages(void)
289 {
290- gchar *filename = g_build_filename (g_get_home_dir(),
da8ac9c7 291+ gchar *filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
1c13b742 292 GALEON_DIR"/sidebars.xml",
293 NULL);
294
7982d49b 295diff -urN aa/galeon-1.3.15/src/galeon-favicon-cache.c galeon-1.3.15/src/galeon-favicon-cache.c
296--- aa/galeon-1.3.15/src/galeon-favicon-cache.c 2004-05-19 21:39:39.000000000 +0200
297+++ galeon-1.3.15/src/galeon-favicon-cache.c 2004-06-01 21:20:38.018979688 +0200
298@@ -128,11 +128,11 @@
1c13b742 299 (GDestroyNotify) g_free,
300 (GDestroyNotify) g_object_unref);
301
302- cache->priv->filename = g_build_filename (g_get_home_dir (),
7982d49b 303+ cache->priv->filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 304 GALEON_DIR,
305 "favicon_cache.xml",
306 NULL);
307- cache->priv->directory = g_build_filename (g_get_home_dir (),
7982d49b 308+ cache->priv->directory = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 309 GALEON_DIR,
310 "favicon_cache/",
311 NULL);
7982d49b 312diff -urN aa/galeon-1.3.15/src/galeon-popup.c galeon-1.3.15/src/galeon-popup.c
313--- aa/galeon-1.3.15/src/galeon-popup.c 2004-05-22 17:47:12.000000000 +0200
314+++ galeon-1.3.15/src/galeon-popup.c 2004-06-01 21:20:50.895022232 +0200
315@@ -898,7 +898,7 @@
da8ac9c7 316 persist = galeon_embed_persist_new (popup->priv->embed);
317
318 base = g_path_get_basename (location);
319- dest = g_build_filename (g_get_home_dir (),
320+ dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
321 GALEON_DIR,
322 base, NULL);
323
7982d49b 324diff -urN aa/galeon-1.3.15/src/galeon-shell.c galeon-1.3.15/src/galeon-shell.c
325--- aa/galeon-1.3.15/src/galeon-shell.c 2004-05-31 00:44:33.000000000 +0200
326+++ galeon-1.3.15/src/galeon-shell.c 2004-06-01 21:20:31.724936528 +0200
da8ac9c7 327@@ -312,7 +312,7 @@
328
329 if (gs->priv->toolbars_model)
330 {
331- gchar *tb_file = g_build_filename (g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
332+ gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
333 egg_toolbars_model_save (gs->priv->toolbars_model, tb_file, "0");
334 g_free (tb_file);
335 g_object_unref (gs->priv->toolbars_model);
336@@ -641,7 +641,7 @@
1c13b742 337 {
338 /* this is temp code, I need to think about how to properly initialize bookmarks */
339 GbXBEL *io = gb_xbel_new ();
340- gchar *filename = g_strconcat (g_get_home_dir (), "/",
da8ac9c7 341+ gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), "/",
1c13b742 342 GALEON_DIR "/bookmarks.xbel", NULL);
343
344 /* init the bookmark icon provider */
7982d49b 345diff -urN aa/galeon-1.3.15/src/migrate.c galeon-1.3.15/src/migrate.c
346--- aa/galeon-1.3.15/src/migrate.c 2004-02-07 23:15:39.000000000 +0100
347+++ galeon-1.3.15/src/migrate.c 2004-06-01 21:20:54.374493272 +0200
da8ac9c7 348@@ -247,7 +247,7 @@
349 static void
350 migrate_toolbar ()
351 {
352- gchar *tb_file = g_build_filename (g_get_home_dir (),
353+ gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
354 GALEON_DIR, "toolbars.xml", NULL);
355
356 gchar *toolbar;
7982d49b 357diff -urN aa/galeon-1.3.15/src/session.c galeon-1.3.15/src/session.c
358--- aa/galeon-1.3.15/src/session.c 2004-03-30 23:33:05.000000000 +0200
359+++ galeon-1.3.15/src/session.c 2004-06-01 21:20:46.722656528 +0200
360@@ -165,14 +165,14 @@
1c13b742 361
362 if (strcmp (filename, SESSION_SAVED) == 0)
363 {
364- save_to = g_build_filename (g_get_home_dir (),
7982d49b 365+ save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 366 GALEON_DIR,
367 "session_saved.xml",
368 NULL);
369 }
370 else if (strcmp (filename, SESSION_CRASHED) == 0)
371 {
372- save_to = g_build_filename (g_get_home_dir (),
7982d49b 373+ save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 374 GALEON_DIR,
375 "session_crashed.xml",
376 NULL);
7982d49b 377@@ -181,7 +181,7 @@
1c13b742 378 {
379 char *tmp;
380
381- save_to = g_build_filename (g_get_home_dir (),
7982d49b 382+ save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 383 GALEON_DIR,
384 "session_gnome-XXXXXX",
385 NULL);
7982d49b 386diff -urN aa/galeon-1.3.15/utils/gul-download.c galeon-1.3.15/utils/gul-download.c
387--- aa/galeon-1.3.15/utils/gul-download.c 2004-03-30 23:33:06.000000000 +0200
388+++ galeon-1.3.15/utils/gul-download.c 2004-06-01 21:21:03.541099736 +0200
da8ac9c7 389@@ -74,7 +74,7 @@
390 prefDir = eel_gconf_get_string(CONF_DOWNLOADING_DIR);
391 if (!prefDir)
392 {
393- prefDir = g_strdup (g_get_home_dir());
394+ prefDir = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
395 }
396 utf8DirName = g_strconcat(prefDir, "/", NULL);
397 g_free(prefDir);
398@@ -179,7 +179,7 @@
399 }
400 else
401 {
402- utf8ExpDir = g_strdup(g_get_home_dir());
403+ utf8ExpDir = g_strdup(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
404 }
405
406 /* Dirname must be locale encoded as explained above */
7982d49b 407diff -urN aa/galeon-1.3.15/utils/gul-general.c galeon-1.3.15/utils/gul-general.c
408--- aa/galeon-1.3.15/utils/gul-general.c 2004-03-30 23:33:06.000000000 +0200
409+++ galeon-1.3.15/utils/gul-general.c 2004-06-01 21:21:08.278379560 +0200
da8ac9c7 410@@ -178,7 +178,7 @@
1c13b742 411 }
412
413 /* try the default */
414- file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL);
da8ac9c7 415+ file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, fname, NULL);
1c13b742 416
417 /* success? */
418 if (g_file_test (file, G_FILE_TEST_EXISTS))
7982d49b 419diff -urN aa/galeon-1.3.15/utils/gul-state.c galeon-1.3.15/utils/gul-state.c
420--- aa/galeon-1.3.15/utils/gul-state.c 2004-03-29 23:55:56.000000000 +0200
421+++ galeon-1.3.15/utils/gul-state.c 2004-06-01 21:21:13.146639472 +0200
da8ac9c7 422@@ -53,7 +53,7 @@
1c13b742 423 char *config_prefix;
1c13b742 424
425 /* Using ~/.galeon/state.ini to keep all files together. */
426- state_file = g_build_filename (g_get_home_dir(),
da8ac9c7 427+ state_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
1c13b742 428 ".galeon", "state.ini", NULL);
429
430 config_prefix = g_strconcat ("=", state_file, "=/", NULL);
7982d49b 431diff -urN aa/galeon-1.3.15/utils/gul-string.c galeon-1.3.15/utils/gul-string.c
432--- aa/galeon-1.3.15/utils/gul-string.c 2004-03-30 23:33:06.000000000 +0200
433+++ galeon-1.3.15/utils/gul-string.c 2004-06-01 21:21:18.310854392 +0200
da8ac9c7 434@@ -315,7 +315,7 @@
435 if (!str) return NULL;
436 if (str[0] != '~') return g_strdup (str);
437
438- return g_strconcat (g_get_home_dir (), str + 1, NULL);
439+ return g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), str + 1, NULL);
440 }
441
442 int
Galeon - gecko-based GNOME web browser
This page took 3.694703 seconds and 4 git commands to generate.