]> 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 2
[packages/galeon.git] / galeon-home_etc.patch
CommitLineData
2f5a513e 1diff -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
4@@ -111,28 +111,28 @@
da8ac9c7 5 GSList *ret = NULL;
6 gchar *dir;
da8ac9c7 7
8- dir = g_build_filename (g_get_home_dir (), ".kde", NULL);
2f5a513e 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);
2f5a513e 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);
2f5a513e 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);
2f5a513e 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);
2f5a513e 37@@ -142,7 +142,7 @@
da8ac9c7 38 {
39 /* give a default */
40 ret = g_slist_prepend
41- (ret, g_build_filename (g_get_home_dir (),
2f5a513e 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
2f5a513e 46diff -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
49@@ -111,7 +111,7 @@
da8ac9c7 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);
2f5a513e 54+ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".mozilla", NULL);
da8ac9c7 55 l = gul_find_file (dir, "bookmarks.html", 4);
56 if (l == NULL)
57 {
2f5a513e 58diff -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
61@@ -109,7 +109,7 @@
da8ac9c7 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);
2f5a513e 66+ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".netscape", NULL);
da8ac9c7 67 l = gul_find_file (dir, "bookmarks.html", 4);
68 if (l == NULL)
69 {
2f5a513e 70diff -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
73@@ -119,7 +119,7 @@
da8ac9c7 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);
2f5a513e 82diff -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
85@@ -121,7 +121,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);
2f5a513e 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)
2f5a513e 94@@ -140,7 +140,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);
2f5a513e 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);
2f5a513e 103diff -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
106@@ -108,7 +108,7 @@
da8ac9c7 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);
2f5a513e 111+ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".mozilla", NULL);
da8ac9c7 112 l = gul_find_file (dir, "bookmarks.html", 4);
113 g_free (dir);
114 return l;
2f5a513e 115diff -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
118@@ -109,7 +109,7 @@
da8ac9c7 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);
2f5a513e 123+ gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") :g_get_home_dir (), ".netscape", NULL);
da8ac9c7 124 l = gul_find_file (dir, "bookmarks.html", 4);
125 g_free (dir);
126 return l;
2f5a513e 127diff -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
130@@ -127,7 +127,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;
2f5a513e 139diff -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
142@@ -655,7 +655,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
2f5a513e 151diff -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
154@@ -241,7 +241,7 @@
7982d49b 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);
2f5a513e 163@@ -300,7 +300,7 @@
7982d49b 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);
2f5a513e 172diff -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
175@@ -355,7 +355,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 */
2f5a513e 184@@ -505,7 +505,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);
2f5a513e 193diff -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
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
2f5a513e 218diff -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);
223
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 ());
227
228 model->priv->mime_filter_values = NULL;
229 model->priv->group_filter_values = NULL;
230diff -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
233@@ -339,7 +339,7 @@
1c13b742 234 mozilla_init_profile (void)
235 {
236 char *profile_path;
237- profile_path = g_build_filename (g_get_home_dir (),
da8ac9c7 238+ profile_path = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 239 MOZILLA_PROFILE_DIR,
240 NULL);
241 gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
2f5a513e 242diff -urN aa/galeon-1.3.17/mozilla/MyportalProtocolHandler.cpp galeon-1.3.17/mozilla/MyportalProtocolHandler.cpp
243--- aa/galeon-1.3.17/mozilla/MyportalProtocolHandler.cpp 2004-07-14 22:33:47.000000000 +0200
244+++ galeon-1.3.17/mozilla/MyportalProtocolHandler.cpp 2004-08-10 15:05:50.315260648 +0200
da8ac9c7 245@@ -205,7 +205,7 @@
1c13b742 246
247 /* open the rendering stream */
248 #if USE_INTERMEDIATE_FILE
249- gchar *filename = g_strconcat (g_get_home_dir (),
da8ac9c7 250+ gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 251 "/.galeon/myportal.html",
252 NULL);
253 gchar *myportalURI = g_strconcat ("file://",filename, NULL);
2f5a513e 254diff -urN aa/galeon-1.3.17/mozilla/ProgressListener.cpp galeon-1.3.17/mozilla/ProgressListener.cpp
255--- aa/galeon-1.3.17/mozilla/ProgressListener.cpp 2004-08-01 23:43:02.000000000 +0200
256+++ galeon-1.3.17/mozilla/ProgressListener.cpp 2004-08-10 15:05:55.201517824 +0200
257@@ -903,7 +903,7 @@
7982d49b 258 !g_file_test (dirName, G_FILE_TEST_IS_DIR))
259 {
260 g_free (dirName);
261- dirName = g_strdup (g_get_home_dir ());
262+ dirName = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ());
263 }
264
265
2f5a513e 266diff -urN aa/galeon-1.3.17/mozilla/SideBar.cpp galeon-1.3.17/mozilla/SideBar.cpp
267--- aa/galeon-1.3.17/mozilla/SideBar.cpp 2004-06-06 15:45:26.000000000 +0200
268+++ galeon-1.3.17/mozilla/SideBar.cpp 2004-08-10 15:06:03.224298176 +0200
269@@ -263,7 +263,7 @@
1c13b742 270
271 void GSidebar::LoadSidebarPages(void)
272 {
273- gchar *filename = g_build_filename(g_get_home_dir(),
da8ac9c7 274+ gchar *filename = g_build_filename(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
1c13b742 275 GALEON_DIR"/sidebars.xml",
276 NULL);
277
2f5a513e 278@@ -308,7 +308,7 @@
1c13b742 279
280 void GSidebar::SaveSidebarPages(void)
281 {
282- gchar *filename = g_build_filename (g_get_home_dir(),
da8ac9c7 283+ gchar *filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
1c13b742 284 GALEON_DIR"/sidebars.xml",
285 NULL);
286
2f5a513e 287diff -urN aa/galeon-1.3.17/src/galeon-favicon-cache.c galeon-1.3.17/src/galeon-favicon-cache.c
288--- aa/galeon-1.3.17/src/galeon-favicon-cache.c 2004-06-06 14:42:30.000000000 +0200
289+++ galeon-1.3.17/src/galeon-favicon-cache.c 2004-08-10 15:06:24.383081552 +0200
290@@ -134,11 +134,11 @@
1c13b742 291 (GDestroyNotify) g_free,
292 (GDestroyNotify) g_object_unref);
293
294- cache->priv->filename = g_build_filename (g_get_home_dir (),
7982d49b 295+ cache->priv->filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 296 GALEON_DIR,
297 "favicon_cache.xml",
298 NULL);
299- cache->priv->directory = g_build_filename (g_get_home_dir (),
7982d49b 300+ cache->priv->directory = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 301 GALEON_DIR,
302 "favicon_cache/",
303 NULL);
2f5a513e 304diff -urN aa/galeon-1.3.17/src/galeon-shell.c galeon-1.3.17/src/galeon-shell.c
305--- aa/galeon-1.3.17/src/galeon-shell.c 2004-07-29 21:33:16.000000000 +0200
306+++ galeon-1.3.17/src/galeon-shell.c 2004-08-10 15:06:12.927823016 +0200
307@@ -318,7 +318,7 @@
da8ac9c7 308
309 if (gs->priv->toolbars_model)
310 {
311- gchar *tb_file = g_build_filename (g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
312+ gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
313 egg_toolbars_model_save (gs->priv->toolbars_model, tb_file, "0");
314 g_free (tb_file);
315 g_object_unref (gs->priv->toolbars_model);
2f5a513e 316@@ -651,7 +651,7 @@
1c13b742 317 {
318 /* this is temp code, I need to think about how to properly initialize bookmarks */
319 GbXBEL *io = gb_xbel_new ();
320- gchar *filename = g_strconcat (g_get_home_dir (), "/",
da8ac9c7 321+ gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), "/",
1c13b742 322 GALEON_DIR "/bookmarks.xbel", NULL);
323
324 /* init the bookmark icon provider */
2f5a513e 325diff -urN aa/galeon-1.3.17/src/migrate.c galeon-1.3.17/src/migrate.c
326--- aa/galeon-1.3.17/src/migrate.c 2004-07-04 11:41:53.000000000 +0200
327+++ galeon-1.3.17/src/migrate.c 2004-08-10 15:06:50.993036224 +0200
da8ac9c7 328@@ -247,7 +247,7 @@
329 static void
330 migrate_toolbar ()
331 {
332- gchar *tb_file = g_build_filename (g_get_home_dir (),
333+ gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
334 GALEON_DIR, "toolbars.xml", NULL);
335
336 gchar *toolbar;
2f5a513e 337diff -urN aa/galeon-1.3.17/src/popup-commands.c galeon-1.3.17/src/popup-commands.c
338--- aa/galeon-1.3.17/src/popup-commands.c 2004-08-07 19:09:26.000000000 +0200
339+++ galeon-1.3.17/src/popup-commands.c 2004-08-10 15:06:29.432313952 +0200
340@@ -439,7 +439,7 @@
341 persist = galeon_embed_persist_new (embed);
342
343 base = g_path_get_basename (location);
344- dest = g_build_filename (g_get_home_dir (),
345+ dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
346 GALEON_DIR,
347 base, NULL);
348
349diff -urN aa/galeon-1.3.17/src/session.c galeon-1.3.17/src/session.c
350--- aa/galeon-1.3.17/src/session.c 2004-06-06 14:42:30.000000000 +0200
351+++ galeon-1.3.17/src/session.c 2004-08-10 15:06:44.638002336 +0200
352@@ -171,14 +171,14 @@
1c13b742 353
354 if (strcmp (filename, SESSION_SAVED) == 0)
355 {
356- save_to = g_build_filename (g_get_home_dir (),
7982d49b 357+ save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 358 GALEON_DIR,
359 "session_saved.xml",
360 NULL);
361 }
362 else if (strcmp (filename, SESSION_CRASHED) == 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_crashed.xml",
368 NULL);
2f5a513e 369@@ -187,7 +187,7 @@
1c13b742 370 {
371 char *tmp;
372
373- save_to = g_build_filename (g_get_home_dir (),
7982d49b 374+ save_to = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
1c13b742 375 GALEON_DIR,
376 "session_gnome-XXXXXX",
377 NULL);
2f5a513e 378diff -urN aa/galeon-1.3.17/utils/gul-download.c galeon-1.3.17/utils/gul-download.c
379--- aa/galeon-1.3.17/utils/gul-download.c 2004-03-30 23:33:06.000000000 +0200
380+++ galeon-1.3.17/utils/gul-download.c 2004-08-10 15:07:00.277624752 +0200
da8ac9c7 381@@ -74,7 +74,7 @@
382 prefDir = eel_gconf_get_string(CONF_DOWNLOADING_DIR);
383 if (!prefDir)
384 {
385- prefDir = g_strdup (g_get_home_dir());
386+ prefDir = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
387 }
388 utf8DirName = g_strconcat(prefDir, "/", NULL);
389 g_free(prefDir);
390@@ -179,7 +179,7 @@
391 }
392 else
393 {
394- utf8ExpDir = g_strdup(g_get_home_dir());
395+ utf8ExpDir = g_strdup(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
396 }
397
398 /* Dirname must be locale encoded as explained above */
2f5a513e 399diff -urN aa/galeon-1.3.17/utils/gul-file-chooser.c galeon-1.3.17/utils/gul-file-chooser.c
400--- aa/galeon-1.3.17/utils/gul-file-chooser.c 2004-07-18 21:23:36.000000000 +0200
401+++ galeon-1.3.17/utils/gul-file-chooser.c 2004-08-10 15:07:17.510005032 +0200
402@@ -311,18 +311,18 @@
403 */
404
405 if (download_dir != NULL &&
406- !str_is_equal (download_dir, g_get_home_dir ()))
407+ !str_is_equal (download_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()))
408 {
409 gtk_file_chooser_add_shortcut_folder (chooser, download_dir, NULL);
410 }
411 if (upload_dir != NULL &&
412- !str_is_equal (upload_dir, g_get_home_dir ()) &&
413+ !str_is_equal (upload_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()) &&
414 !str_is_equal (upload_dir, download_dir))
415 {
416 gtk_file_chooser_add_shortcut_folder (chooser, upload_dir, NULL);
417 }
418 if (open_dir != NULL &&
419- !str_is_equal (open_dir, g_get_home_dir ()) &&
420+ !str_is_equal (open_dir, getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ()) &&
421 !str_is_equal (open_dir, download_dir) &&
422 !str_is_equal (open_dir, upload_dir))
423 {
424diff -urN aa/galeon-1.3.17/utils/gul-general.c galeon-1.3.17/utils/gul-general.c
425--- aa/galeon-1.3.17/utils/gul-general.c 2004-03-30 23:33:06.000000000 +0200
426+++ galeon-1.3.17/utils/gul-general.c 2004-08-10 15:07:06.053746648 +0200
da8ac9c7 427@@ -178,7 +178,7 @@
1c13b742 428 }
429
430 /* try the default */
431- file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL);
da8ac9c7 432+ file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, fname, NULL);
1c13b742 433
434 /* success? */
435 if (g_file_test (file, G_FILE_TEST_EXISTS))
2f5a513e 436diff -urN aa/galeon-1.3.17/utils/gul-state.c galeon-1.3.17/utils/gul-state.c
437--- aa/galeon-1.3.17/utils/gul-state.c 2004-03-29 23:55:56.000000000 +0200
438+++ galeon-1.3.17/utils/gul-state.c 2004-08-10 15:07:22.590232720 +0200
da8ac9c7 439@@ -53,7 +53,7 @@
1c13b742 440 char *config_prefix;
1c13b742 441
442 /* Using ~/.galeon/state.ini to keep all files together. */
443- state_file = g_build_filename (g_get_home_dir(),
da8ac9c7 444+ state_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
1c13b742 445 ".galeon", "state.ini", NULL);
446
447 config_prefix = g_strconcat ("=", state_file, "=/", NULL);
2f5a513e 448diff -urN aa/galeon-1.3.17/utils/gul-string.c galeon-1.3.17/utils/gul-string.c
449--- aa/galeon-1.3.17/utils/gul-string.c 2004-03-30 23:33:06.000000000 +0200
450+++ galeon-1.3.17/utils/gul-string.c 2004-08-10 15:07:29.456188936 +0200
da8ac9c7 451@@ -315,7 +315,7 @@
452 if (!str) return NULL;
453 if (str[0] != '~') return g_strdup (str);
454
455- return g_strconcat (g_get_home_dir (), str + 1, NULL);
456+ return g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), str + 1, NULL);
457 }
458
459 int
Galeon - gecko-based GNOME web browser
This page took 0.101788 seconds and 4 git commands to generate.