- corrections in global history to build against version 2.0.0

Changed files:
    galeon-home_etc.patch -> 1.8

diff --git a/galeon-home_etc.patch b/galeon-home_etc.patch
index ad59c6b50898a3b9993e041490064896a4cf22ac..83c7a30cddf05248b691e143ca5920a4216cd4ce 100644 (file)
--- a/galeon-home_etc.patch
+++ b/galeon-home_etc.patch
@@ -172,23 +172,32 @@ diff -urN aa/galeon-1.3.17/embed/galeon-embed-utils.c galeon-1.3.17/embed/galeon
 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
-@@ -355,7 +355,7 @@
-         gchar *histfile;
+@@ -398,7 +398,7 @@
+ {
+       char *histfile;
  
-       /* build the filename */
 -      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, 
++    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);
+ 
+-      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);
-       
-       /* build the initial history hash table */
-@@ -505,7 +505,7 @@
+       if (access (histfile, F_OK) == 0)
+       {
+@@ -608,7 +608,7 @@
                return;
        }
  
 -      histfile = g_build_filename (g_get_home_dir (),
 +      histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
                                     GALEON_DIR,
-                                    "history.xml",
+                                    "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