- updated to galeon-1.3.14

Changed files:
    galeon-home_etc.patch -> 1.4
    galeon-locale-names.patch -> 1.2

diff --git a/galeon-home_etc.patch b/galeon-home_etc.patch
index 0d36b11ee0d83eac95c60c7eed09d24cc583a6b9..b4362f9c1594e8872575451e9ec57f7bb5e5bc75 100644 (file)
--- a/galeon-home_etc.patch
+++ b/galeon-home_etc.patch
@@ -1,6 +1,89 @@
-diff -Nru galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.10/bookmarks/bookmarks-import-druid-konqueror.c
---- galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c    2002-12-15 21:24:08.000000000 +0100
-+++ galeon-1.3.10/bookmarks/bookmarks-import-druid-konqueror.c 2003-11-13 12:26:57.000000000 +0100
+diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-konqueror.c galeon-1.3.13a/bookmarks/bookmarks-export-druid-konqueror.c
+--- aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-konqueror.c     2002-09-11 20:22:54.000000000 +0200
++++ galeon-1.3.13a/bookmarks/bookmarks-export-druid-konqueror.c        2004-03-20 18:24:51.152443440 +0100
+@@ -133,29 +133,30 @@
+       GSList *l;
+       GSList *ret = NULL;
+       gchar *dir;
++      gchar *home_etc = getenv("HOME_ETC");
+       
+-      dir = g_build_filename (g_get_home_dir (), ".kde", NULL);
++      dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), ".kde", NULL);
+       l = gul_find_file  (dir, "bookmarks.xbel", 5);
+       ret = g_slist_concat (ret, l);
+       l = gul_find_file (dir, "bookmarks.xml", 5);
+       ret = g_slist_concat (ret, l);
+       g_free (dir);
+ 
+-      dir = g_build_filename (g_get_home_dir (), ".kde2", NULL);
++      dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), ".kde2", NULL);
+       l = gul_find_file (dir, "bookmarks.xbel", 5);
+       ret = g_slist_concat (ret, l);
+       l = gul_find_file (dir, "bookmarks.xml", 5);
+       ret = g_slist_concat (ret, l);
+       g_free (dir);
+ 
+-      dir = g_build_filename (g_get_home_dir (), ".kde3", NULL);
++      dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), ".kde3", NULL);
+       l = gul_find_file (dir, "bookmarks.xbel", 5);
+       ret = g_slist_concat (ret, l);
+       l = gul_find_file (dir, "bookmarks.xml", 5);
+       ret = g_slist_concat (ret, l);
+       g_free (dir);
+ 
+-      dir = g_build_filename (g_get_home_dir (), ".konqueror", NULL);
++      dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), ".konqueror", NULL);
+       l = gul_find_file (dir, "bookmarks.xbel", 5);
+       ret = g_slist_concat (ret, l);
+       l = gul_find_file (dir, "bookmarks.xml", 5);
+@@ -165,7 +166,7 @@
+       {
+               /* give a default */
+               ret = g_slist_prepend
+-                      (ret, g_build_filename (g_get_home_dir (), 
++                      (ret, g_build_filename (home_etc ? home_etc : g_get_home_dir (), 
+                                               ".kde/share/apps/konqueror/bookmarks.xml", NULL));
+       }
+ 
+diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-mozilla.c galeon-1.3.13a/bookmarks/bookmarks-export-druid-mozilla.c
+--- aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-mozilla.c       2002-09-11 20:22:54.000000000 +0200
++++ galeon-1.3.13a/bookmarks/bookmarks-export-druid-mozilla.c  2004-03-20 18:25:30.731426520 +0100
+@@ -131,7 +131,7 @@
+ gb_export_druid_mozilla_get_locations_impl (GbExportDruid *druid)
+ {
+       GSList *l;
+-      gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL);
++      gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".mozilla", NULL);
+       l = gul_find_file  (dir, "bookmarks.html", 4);
+       if (l == NULL)
+       {
+diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-netscape.c galeon-1.3.13a/bookmarks/bookmarks-export-druid-netscape.c
+--- aa/galeon-1.3.13a/bookmarks/bookmarks-export-druid-netscape.c      2002-09-11 20:22:54.000000000 +0200
++++ galeon-1.3.13a/bookmarks/bookmarks-export-druid-netscape.c 2004-03-20 18:25:45.674154880 +0100
+@@ -131,7 +131,7 @@
+ gb_export_druid_netscape_get_locations_impl (GbExportDruid *druid)
+ {
+       GSList *l;
+-      gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL);
++      gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".netscape", NULL);
+       l = gul_find_file (dir, "bookmarks.html", 4);
+       if (l == NULL)
+       {
+diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-epiphany.c galeon-1.3.13a/bookmarks/bookmarks-import-druid-epiphany.c
+--- aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-epiphany.c      2003-12-19 00:42:19.000000000 +0100
++++ galeon-1.3.13a/bookmarks/bookmarks-import-druid-epiphany.c 2004-03-20 18:26:03.695415232 +0100
+@@ -140,7 +140,7 @@
+       GSList *l;
+       gchar *dir;
+ 
+-      dir = g_build_filename (g_get_home_dir (),
++      dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
+                               GNOME_DOT_GNOME,
+                               "epiphany",
+                               NULL);
+diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-konqueror.c galeon-1.3.13a/bookmarks/bookmarks-import-druid-konqueror.c
+--- aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-konqueror.c     2004-03-20 17:43:20.000000000 +0100
++++ galeon-1.3.13a/bookmarks/bookmarks-import-druid-konqueror.c        2004-03-20 18:26:53.570833016 +0100
 @@ -134,6 +134,7 @@
        GSList *ret = NULL;
        gchar *dir;
@@ -12,147 +95,246 @@ diff -Nru galeon-1.3.10.orig/bookmarks/bookmarks-import-druid-konqueror.c galeon
 @@ -143,7 +144,7 @@
        for (i = 0; i < G_N_ELEMENTS (galeon_dirs); ++i)
        {
-               uint j;
+               guint j;
 -              dir = g_build_filename (g_get_home_dir (), galeon_dirs[i], NULL);
 +              dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), galeon_dirs[i], NULL);
                l = gul_find_file  (dir, "bookmarks.xbel", 5);
                ret = g_slist_concat (ret, l);
                for (j = 0; j < 10; ++j)
-diff -Nru galeon-1.3.10.orig/bookmarks/testbookmarks.c galeon-1.3.10/bookmarks/testbookmarks.c
---- galeon-1.3.10.orig/bookmarks/testbookmarks.c       2002-07-23 14:06:55.000000000 +0200
-+++ galeon-1.3.10/bookmarks/testbookmarks.c    2003-11-13 12:26:57.000000000 +0100
-@@ -132,8 +132,9 @@
- int 
+@@ -162,7 +163,7 @@
+       /* konqueror locations */
+       for (i = 0; i < G_N_ELEMENTS (kde_dirs); ++i)
+       {
+-              dir = g_build_filename (g_get_home_dir (), kde_dirs[i], NULL);
++              dir = g_build_filename (home_etc ? home_etc : g_get_home_dir (), kde_dirs[i], NULL);
+               l = gul_find_file  (dir, "bookmarks.xbel", 5);
+               ret = g_slist_concat (ret, l);
+               l = gul_find_file (dir, "bookmarks.xml", 5);
+diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-mozilla.c galeon-1.3.13a/bookmarks/bookmarks-import-druid-mozilla.c
+--- aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-mozilla.c       2002-09-11 20:22:54.000000000 +0200
++++ galeon-1.3.13a/bookmarks/bookmarks-import-druid-mozilla.c  2004-03-20 18:27:04.138226528 +0100
+@@ -131,7 +131,7 @@
+ gb_import_druid_mozilla_get_locations_impl (GbImportDruid *druid)
+ {
+       GSList *l;
+-      gchar *dir = g_build_filename (g_get_home_dir (), ".mozilla", NULL);
++      gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".mozilla", NULL);
+       l = gul_find_file  (dir, "bookmarks.html", 4);
+       g_free (dir);
+       return l;
+diff -urN aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-netscape.c galeon-1.3.13a/bookmarks/bookmarks-import-druid-netscape.c
+--- aa/galeon-1.3.13a/bookmarks/bookmarks-import-druid-netscape.c      2002-09-11 20:22:54.000000000 +0200
++++ galeon-1.3.13a/bookmarks/bookmarks-import-druid-netscape.c 2004-03-20 18:27:14.527647096 +0100
+@@ -131,7 +131,7 @@
+ gb_import_druid_netscape_get_locations_impl (GbImportDruid *druid)
+ {
+       GSList *l;
+-      gchar *dir = g_build_filename (g_get_home_dir (), ".netscape", NULL);
++      gchar *dir = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), ".netscape", NULL);
+       l = gul_find_file (dir, "bookmarks.html", 4);
+       g_free (dir);
+       return l;
+diff -urN aa/galeon-1.3.13a/bookmarks/testbookmarks.c galeon-1.3.13a/bookmarks/testbookmarks.c
+--- aa/galeon-1.3.13a/bookmarks/testbookmarks.c        2002-07-23 14:06:55.000000000 +0200
++++ galeon-1.3.13a/bookmarks/testbookmarks.c   2004-03-20 18:22:38.727575080 +0100
+@@ -133,7 +133,7 @@
  main (int argc, char *argv[])
  {
-+      gchar *home_etc = getenv("HOME_ETC");
        gchar *filename = argc == 2 ? argv[1] 
 -              : g_strconcat (g_get_home_dir (),
-+              : g_strconcat (home_etc ? home_etc : g_get_home_dir (),
++              : g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
                               "/.galeon/bookmarks.xbel", NULL);
        GbBookmarkSet *set;
        GbFolder *folder1, *folder2, *r;
-diff -Nru galeon-1.3.10.orig/embed/global-history.c galeon-1.3.10/embed/global-history.c
---- galeon-1.3.10.orig/embed/global-history.c  2003-09-19 07:00:23.000000000 +0200
-+++ galeon-1.3.10/embed/global-history.c       2003-11-13 12:34:52.000000000 +0100
-@@ -389,6 +389,7 @@
- static void
- history_load (GlobalHistory *gh)
- {
-+      gchar *home_etc = getenv("HOME_ETC");
-         /* definition of SAX parser for reading documents */
-       static xmlSAXHandler parser =
+diff -urN aa/galeon-1.3.13a/embed/galeon-embed-popup.c galeon-1.3.13a/embed/galeon-embed-popup.c
+--- aa/galeon-1.3.13a/embed/galeon-embed-popup.c       2004-03-20 17:43:36.000000000 +0100
++++ galeon-1.3.13a/embed/galeon-embed-popup.c  2004-03-20 18:28:09.983216568 +0100
+@@ -657,7 +657,7 @@
+       persist = galeon_embed_persist_new (popup->priv->embed);
+       
+       base = g_path_get_basename (location);
+-      dest = g_build_filename (g_get_home_dir (), 
++      dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), 
+                                GALEON_DIR, 
+                                base, NULL);
+       
+diff -urN aa/galeon-1.3.13a/embed/galeon-embed-utils.c galeon-1.3.13a/embed/galeon-embed-utils.c
+--- aa/galeon-1.3.13a/embed/galeon-embed-utils.c       2004-03-20 17:43:36.000000000 +0100
++++ galeon-1.3.13a/embed/galeon-embed-utils.c  2004-03-20 18:28:24.762969704 +0100
+@@ -113,7 +113,7 @@
+       if (!dirName || dirName[0] == '\0')
+       {
+               g_free (dirName);
+-              dirName = g_strdup (g_get_home_dir ());
++              dirName = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir ());
+       }
+       else
        {
-@@ -421,7 +422,7 @@
+diff -urN aa/galeon-1.3.13a/embed/global-history.c galeon-1.3.13a/embed/global-history.c
+--- aa/galeon-1.3.13a/embed/global-history.c   2004-03-20 17:43:36.000000000 +0100
++++ galeon-1.3.13a/embed/global-history.c      2004-03-20 18:28:55.182345256 +0100
+@@ -358,7 +358,7 @@
          gchar *histfile;
  
        /* build the filename */
 -      histfile = g_build_filename (g_get_home_dir (), GALEON_DIR, 
-+      histfile = g_build_filename (home_etc ? home_etc : 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 */
-@@ -526,6 +527,7 @@
- history_save (GlobalHistoryPrivate *ghpriv)
- {
-       gchar *histfile, *tmpfile;
-+      gchar *home_etc = getenv("HOME_ETC");
-       FILE *fp;
-       int ret;
- 
-@@ -538,7 +540,7 @@
+@@ -564,7 +564,7 @@
                return;
        }
  
 -      histfile = g_build_filename (g_get_home_dir (),
-+      histfile = g_build_filename (home_etc ? home_etc : g_get_home_dir (),
++      histfile = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
                                     GALEON_DIR,
                                     "history.xml",
                                     NULL);
-diff -Nru galeon-1.3.10.orig/galeon-config-tool.in galeon-1.3.10/galeon-config-tool.in
---- galeon-1.3.10.orig/galeon-config-tool.in   2002-03-14 08:40:24.000000000 +0100
-+++ galeon-1.3.10/galeon-config-tool.in        2003-11-13 12:26:57.000000000 +0100
+diff -urN aa/galeon-1.3.13a/galeon-config-tool.in galeon-1.3.13a/galeon-config-tool.in
+--- aa/galeon-1.3.13a/galeon-config-tool.in    2002-03-14 08:40:24.000000000 +0100
++++ galeon-1.3.13a/galeon-config-tool.in       2004-03-20 18:37:51.238852280 +0100
 @@ -44,6 +44,21 @@
                    echo "Removing $HOME/.gnome/accels/galeon"
                    rm -rf $HOME/.gnome/accels/galeon
  
 +                              if [ -n "$HOME_ETC" ]; then
-+                      echo "Removing $HOME_ETC/.galeon"
-+                              rm -rf $HOME_ETC/.galeon
++                                      echo "Removing $HOME_ETC/.galeon"
++                                      rm -rf $HOME_ETC/.galeon
 +
-+                      echo "Removing $HOME_ETC/.gconf/apps/galeon"
-+                      rm -rf $HOME_ETC/.gconf/apps/galeon
++                                      echo "Removing $HOME_ETC/.gconf/apps/galeon"
++                                      rm -rf $HOME_ETC/.gconf/apps/galeon
 +
-+                      echo "Removing $HOME_ETC/.gnome/galeon"
-+                      rm -rf $HOME_ETC/.gnome/galeon
++                                      echo "Removing $HOME_ETC/.gnome/galeon"
++                                      rm -rf $HOME_ETC/.gnome/galeon
 +
-+                      echo "Removing $HOME_ETC/.gnome/accels/galeon"
-+                      rm -rf $HOME_ETC/.gnome/accels/galeon
-+                              
++                                      echo "Removing $HOME_ETC/.gnome/accels/galeon"
++                                      rm -rf $HOME_ETC/.gnome/accels/galeon
++                                      
 +                              fi
 +
                    echo "...Done."
  
            else
-diff -Nru galeon-1.3.10.orig/mozilla/mozilla-embed-shell.cpp galeon-1.3.10/mozilla/mozilla-embed-shell.cpp
---- galeon-1.3.10.orig/mozilla/mozilla-embed-shell.cpp 2003-09-25 05:36:35.000000000 +0200
-+++ galeon-1.3.10/mozilla/mozilla-embed-shell.cpp      2003-11-13 12:39:02.000000000 +0100
-@@ -331,7 +331,8 @@
+diff -urN aa/galeon-1.3.13a/mozilla/ContentHandler.cpp galeon-1.3.13a/mozilla/ContentHandler.cpp
+--- aa/galeon-1.3.13a/mozilla/ContentHandler.cpp       2004-03-20 17:43:37.000000000 +0100
++++ galeon-1.3.13a/mozilla/ContentHandler.cpp  2004-03-20 18:39:44.462639648 +0100
+@@ -305,6 +305,7 @@
+                                                  nsILocalFile **_retval)
+ {
+       nsresult rv;
++      gchar *home_etc = getenv("HOME_ETC");
+ 
+       mContext = aWindowContext;
+ 
+@@ -329,7 +330,7 @@
+       if (!dirName || dirName[0] == '\0')
+       {
+               g_free (dirName);
+-              dirName = g_strdup (g_get_home_dir ());
++              dirName = g_strdup (home_etc ? home_etc : g_get_home_dir ());
+       }
+       else
+       {
+@@ -349,7 +350,7 @@
+           !g_file_test (expanded_directory, G_FILE_TEST_IS_DIR))
+       {
+               g_free (expanded_directory);
+-              expanded_directory = g_strdup (g_get_home_dir());
++              expanded_directory = g_strdup (home_etc ? home_etc : g_get_home_dir());
+       }
+ 
+       nsCOMPtr<nsILocalFile> saveDir = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID);
+diff -urN aa/galeon-1.3.13a/mozilla/FilePicker.cpp galeon-1.3.13a/mozilla/FilePicker.cpp
+--- aa/galeon-1.3.13a/mozilla/FilePicker.cpp   2004-03-20 17:43:37.000000000 +0100
++++ galeon-1.3.13a/mozilla/FilePicker.cpp      2004-03-20 18:30:33.183446824 +0100
+@@ -94,7 +94,7 @@
+       if (!dirName || dirName[0] == '\0')
+       {
+               g_free (dirName);
+-              dirName = g_filename_to_utf8 (g_get_home_dir(), -1,
++              dirName = g_filename_to_utf8 (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(), -1,
+                                             NULL, NULL, NULL);
+       }
+ 
+diff -urN aa/galeon-1.3.13a/mozilla/mozilla-embed-shell.cpp galeon-1.3.13a/mozilla/mozilla-embed-shell.cpp
+--- aa/galeon-1.3.13a/mozilla/mozilla-embed-shell.cpp  2004-03-20 17:43:37.000000000 +0100
++++ galeon-1.3.13a/mozilla/mozilla-embed-shell.cpp     2004-03-20 18:31:48.876939664 +0100
+@@ -336,7 +336,7 @@
  mozilla_init_profile (void)
  {
        char *profile_path;
 -      profile_path = g_build_filename (g_get_home_dir (), 
-+      char *home_etc = getenv("HOME_ETC");
-+      profile_path = g_build_filename (home_etc ? home_etc : g_get_home_dir (), 
++      profile_path = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), 
                                         MOZILLA_PROFILE_DIR, 
                                         NULL);
          gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
-diff -Nru galeon-1.3.10.orig/mozilla/MyportalProtocolHandler.cpp galeon-1.3.10/mozilla/MyportalProtocolHandler.cpp
---- galeon-1.3.10.orig/mozilla/MyportalProtocolHandler.cpp     2003-09-15 02:48:24.000000000 +0200
-+++ galeon-1.3.10/mozilla/MyportalProtocolHandler.cpp  2003-11-13 12:26:57.000000000 +0100
-@@ -198,13 +198,14 @@
- NS_METHOD GMyportalProtocolHandler::CreateMyportalPage (const nsACString &path, nsIURI *aURI, nsIChannel **aChannel)
- {
-       nsresult rv;
-+      char *home_etc = getenv("HOME_ETC");
+@@ -1098,7 +1098,7 @@
+             !g_file_test (expanded_directory, G_FILE_TEST_IS_DIR))
+         {
+                 if (expanded_directory) g_free (expanded_directory);
+-                expanded_directory = g_strdup (g_get_home_dir());
++                expanded_directory = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
+         }
  
-       /* check bookmarks are loaded */
-       //      g_return_val_if_fail (bookmarks_root != NULL,NS_ERROR_FAILURE);
+         nsCOMPtr<nsILocalFile> dir = 
+diff -urN aa/galeon-1.3.13a/mozilla/MyportalProtocolHandler.cpp galeon-1.3.13a/mozilla/MyportalProtocolHandler.cpp
+--- aa/galeon-1.3.13a/mozilla/MyportalProtocolHandler.cpp      2004-03-20 17:43:37.000000000 +0100
++++ galeon-1.3.13a/mozilla/MyportalProtocolHandler.cpp 2004-03-20 18:30:44.579714328 +0100
+@@ -205,7 +205,7 @@
        
        /* open the rendering stream */
  #if USE_INTERMEDIATE_FILE
 -      gchar *filename = g_strconcat (g_get_home_dir (),
-+      gchar *filename = g_strconcat (home_etc ? home_etc : g_get_home_dir (),
++      gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (),
                                       "/.galeon/myportal.html",
                                       NULL);
        gchar *myportalURI = g_strconcat ("file://",filename, NULL);
-diff -Nru galeon-1.3.10.orig/mozilla/SideBar.cpp galeon-1.3.10/mozilla/SideBar.cpp
---- galeon-1.3.10.orig/mozilla/SideBar.cpp     2003-09-15 02:56:54.000000000 +0200
-+++ galeon-1.3.10/mozilla/SideBar.cpp  2003-11-13 12:36:30.000000000 +0100
-@@ -255,7 +255,8 @@
+diff -urN aa/galeon-1.3.13a/mozilla/PrintProgressListener.cpp galeon-1.3.13a/mozilla/PrintProgressListener.cpp
+--- aa/galeon-1.3.13a/mozilla/PrintProgressListener.cpp        2002-05-27 03:36:44.000000000 +0200
++++ galeon-1.3.13a/mozilla/PrintProgressListener.cpp   2004-03-20 19:06:21.690824056 +0100
+@@ -20,6 +20,7 @@
+ 
+ /* see the FIXME below */
+ #include <locale.h>
++#include <stdlib.h>
+ 
+ #include <libgnome/gnome-exec.h>
+ 
+@@ -68,7 +69,7 @@
+               {
+                       command = g_strconcat (app->command, " ",
+                                              mFilename, NULL);
+-                      gnome_execute_shell (g_get_home_dir(), command);
++                      gnome_execute_shell (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(), command);
+                       gnome_vfs_mime_application_free (app);
+                       g_free (command);
+               }
+diff -urN aa/galeon-1.3.13a/mozilla/SideBar.cpp galeon-1.3.13a/mozilla/SideBar.cpp
+--- aa/galeon-1.3.13a/mozilla/SideBar.cpp      2004-03-20 17:43:37.000000000 +0100
++++ galeon-1.3.13a/mozilla/SideBar.cpp 2004-03-20 18:31:23.398812928 +0100
+@@ -262,7 +262,7 @@
  
  void GSidebar::LoadSidebarPages(void)
  {
 -      gchar *filename = g_build_filename(g_get_home_dir(),
-+      gchar *home_etc = getenv("HOME_ETC");
-+      gchar *filename = g_build_filename(home_etc ? home_etc : g_get_home_dir(),
++      gchar *filename = g_build_filename(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
                                           GALEON_DIR"/sidebars.xml",
                                           NULL);
  
-@@ -299,7 +300,8 @@
+@@ -307,7 +307,7 @@
  
  void GSidebar::SaveSidebarPages(void)
  {
 -      gchar *filename = g_build_filename (g_get_home_dir(),
-+      gchar *home_etc = getenv("HOME_ETC");
-+      gchar *filename = g_build_filename (home_etc ? home_etc : g_get_home_dir(),
++      gchar *filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
                                            GALEON_DIR"/sidebars.xml",
                                            NULL);
  
-diff -Nru galeon-1.3.10.orig/src/galeon-favicon-cache.c galeon-1.3.10/src/galeon-favicon-cache.c
---- galeon-1.3.10.orig/src/galeon-favicon-cache.c      2003-09-05 03:01:53.000000000 +0200
-+++ galeon-1.3.10/src/galeon-favicon-cache.c   2003-11-13 12:26:57.000000000 +0100
-@@ -114,6 +114,8 @@
+diff -urN aa/galeon-1.3.13a/src/galeon-favicon-cache.c galeon-1.3.13a/src/galeon-favicon-cache.c
+--- aa/galeon-1.3.13a/src/galeon-favicon-cache.c       2004-03-20 17:45:05.000000000 +0100
++++ galeon-1.3.13a/src/galeon-favicon-cache.c  2004-03-20 18:33:55.330715768 +0100
+@@ -116,6 +116,8 @@
  static void
  galeon_favicon_cache_init (GaleonFaviconCache *cache)
  {
@@ -161,7 +343,7 @@ diff -Nru galeon-1.3.10.orig/src/galeon-favicon-cache.c galeon-1.3.10/src/galeon
        cache->priv = g_new0 (GaleonFaviconCachePrivate, 1);
  
        cache->priv->url_to_pixbuf     = g_hash_table_new_full (g_str_hash,
-@@ -125,11 +127,11 @@
+@@ -127,11 +129,11 @@
                                                                (GDestroyNotify) g_free,
                                                                (GDestroyNotify) g_object_unref);
  
@@ -175,22 +357,54 @@ diff -Nru galeon-1.3.10.orig/src/galeon-favicon-cache.c galeon-1.3.10/src/galeon
                                                   GALEON_DIR,
                                                   "favicon_cache/",
                                                   NULL);
-diff -Nru galeon-1.3.10.orig/src/galeon-shell.c galeon-1.3.10/src/galeon-shell.c
---- galeon-1.3.10.orig/src/galeon-shell.c      2003-10-13 23:56:13.000000000 +0200
-+++ galeon-1.3.10/src/galeon-shell.c   2003-11-13 12:26:57.000000000 +0100
-@@ -660,7 +660,8 @@
+diff -urN aa/galeon-1.3.13a/src/galeon-popup.c galeon-1.3.13a/src/galeon-popup.c
+--- aa/galeon-1.3.13a/src/galeon-popup.c       2004-03-20 17:45:06.000000000 +0100
++++ galeon-1.3.13a/src/galeon-popup.c  2004-03-20 18:34:06.987943600 +0100
+@@ -902,7 +902,7 @@
+       persist = galeon_embed_persist_new (popup->priv->embed);
+       
+       base = g_path_get_basename (location);
+-      dest = g_build_filename (g_get_home_dir (), 
++      dest = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), 
+                                GALEON_DIR, 
+                                base, NULL);
+       
+diff -urN aa/galeon-1.3.13a/src/galeon-shell.c galeon-1.3.13a/src/galeon-shell.c
+--- aa/galeon-1.3.13a/src/galeon-shell.c       2004-03-20 17:45:06.000000000 +0100
++++ galeon-1.3.13a/src/galeon-shell.c  2004-03-20 18:32:10.894592472 +0100
+@@ -312,7 +312,7 @@
+ 
+       if (gs->priv->toolbars_model)
+       {
+-              gchar *tb_file = g_build_filename (g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
++              gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, "toolbars.xml", NULL);
+               egg_toolbars_model_save (gs->priv->toolbars_model, tb_file, "0");
+               g_free (tb_file);
+               g_object_unref (gs->priv->toolbars_model);
+@@ -641,7 +641,7 @@
  {
        /* this is temp code, I need to think about how to properly initialize bookmarks */
        GbXBEL *io = gb_xbel_new ();
 -      gchar *filename = g_strconcat (g_get_home_dir (), "/",
-+      gchar *home_etc = getenv("HOME_ETC");
-+      gchar *filename = g_strconcat (home_etc ? home_etc : g_get_home_dir (), "/",
++      gchar *filename = g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), "/",
                                       GALEON_DIR "/bookmarks.xbel", NULL);
        
        /* init the bookmark icon provider */
-diff -Nru galeon-1.3.10.orig/src/session.c galeon-1.3.10/src/session.c
---- galeon-1.3.10.orig/src/session.c   2003-10-22 17:25:06.000000000 +0200
-+++ galeon-1.3.10/src/session.c        2003-11-13 12:26:57.000000000 +0100
+diff -urN aa/galeon-1.3.13a/src/migrate.c galeon-1.3.13a/src/migrate.c
+--- aa/galeon-1.3.13a/src/migrate.c    2004-03-20 17:45:08.000000000 +0100
++++ galeon-1.3.13a/src/migrate.c       2004-03-20 18:32:20.665107128 +0100
+@@ -247,7 +247,7 @@
+ static void
+ migrate_toolbar ()
+ {
+-      gchar *tb_file = g_build_filename (g_get_home_dir (), 
++      gchar *tb_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), 
+                                          GALEON_DIR, "toolbars.xml", NULL);
+ 
+       gchar *toolbar;
+diff -urN aa/galeon-1.3.13a/src/session.c galeon-1.3.13a/src/session.c
+--- aa/galeon-1.3.13a/src/session.c    2004-03-20 17:45:09.000000000 +0100
++++ galeon-1.3.13a/src/session.c       2004-03-20 18:33:09.863627816 +0100
 @@ -160,19 +160,20 @@
  get_session_filename (const char *filename)
  {
@@ -223,38 +437,60 @@ diff -Nru galeon-1.3.10.orig/src/session.c galeon-1.3.10/src/session.c
                                            GALEON_DIR,
                                            "session_gnome-XXXXXX",
                                            NULL);
-diff -Nru galeon-1.3.10.orig/utils/gul-general.c galeon-1.3.10/utils/gul-general.c
---- galeon-1.3.10.orig/utils/gul-general.c     2003-09-08 20:51:28.000000000 +0200
-+++ galeon-1.3.10/utils/gul-general.c  2003-11-13 12:31:43.000000000 +0100
-@@ -75,6 +75,7 @@
-       static GHashTable *already_found = NULL;
-       gchar *alternative[6];
-       gchar *file;
-+      gchar *home_etc = getenv("HOME_ETC");
-       gint i;
-       
-       /* create cache hash table if it doesnt already exist */
-@@ -99,7 +100,7 @@
+diff -urN aa/galeon-1.3.13a/utils/gul-download.c galeon-1.3.13a/utils/gul-download.c
+--- aa/galeon-1.3.13a/utils/gul-download.c     2004-03-20 17:45:12.000000000 +0100
++++ galeon-1.3.13a/utils/gul-download.c        2004-03-20 18:34:32.141119736 +0100
+@@ -74,7 +74,7 @@
+               prefDir = eel_gconf_get_string(CONF_DOWNLOADING_DIR);
+               if (!prefDir)
+               {
+-                      prefDir = g_strdup (g_get_home_dir());
++                      prefDir = g_strdup (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
+               }
+               utf8DirName = g_strconcat(prefDir, "/", NULL);
+               g_free(prefDir);
+@@ -179,7 +179,7 @@
+       }
+       else
+       {
+-              utf8ExpDir = g_strdup(g_get_home_dir());
++              utf8ExpDir = g_strdup(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir());
+       }
+ 
+       /* Dirname must be locale encoded as explained above */
+diff -urN aa/galeon-1.3.13a/utils/gul-general.c galeon-1.3.13a/utils/gul-general.c
+--- aa/galeon-1.3.13a/utils/gul-general.c      2004-03-20 17:45:12.000000000 +0100
++++ galeon-1.3.13a/utils/gul-general.c 2004-03-20 18:34:43.654369456 +0100
+@@ -178,7 +178,7 @@
        }
  
        /* try the default */
 -      file = g_build_filename (g_get_home_dir (), GALEON_DIR, fname, NULL);
-+      file = g_build_filename (home_etc ? home_etc : g_get_home_dir (), GALEON_DIR, fname, NULL);
++      file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), GALEON_DIR, fname, NULL);
        
        /* success? */
        if (g_file_test (file, G_FILE_TEST_EXISTS))
-diff -Nru galeon-1.3.10.orig/utils/gul-state.c galeon-1.3.10/utils/gul-state.c
---- galeon-1.3.10.orig/utils/gul-state.c       2003-08-30 15:50:36.000000000 +0200
-+++ galeon-1.3.10/utils/gul-state.c    2003-11-13 12:26:57.000000000 +0100
-@@ -38,9 +38,10 @@
- {
-       char *state_file;
+diff -urN aa/galeon-1.3.13a/utils/gul-state.c galeon-1.3.13a/utils/gul-state.c
+--- aa/galeon-1.3.13a/utils/gul-state.c        2004-03-20 17:45:12.000000000 +0100
++++ galeon-1.3.13a/utils/gul-state.c   2004-03-20 18:34:54.791676328 +0100
+@@ -53,7 +53,7 @@
        char *config_prefix;
-+      char *home_etc = getenv("HOME_ETC");
  
        /* Using ~/.galeon/state.ini to keep all files together. */
 -      state_file = g_build_filename (g_get_home_dir(),
-+      state_file = g_build_filename (home_etc ? home_etc : g_get_home_dir(),
++      state_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
                                       ".galeon", "state.ini", NULL);
  
        config_prefix = g_strconcat ("=", state_file, "=/", NULL);
+diff -urN aa/galeon-1.3.13a/utils/gul-string.c galeon-1.3.13a/utils/gul-string.c
+--- aa/galeon-1.3.13a/utils/gul-string.c       2004-03-20 17:45:12.000000000 +0100
++++ galeon-1.3.13a/utils/gul-string.c  2004-03-20 18:35:07.199790008 +0100
+@@ -315,7 +315,7 @@
+         if (!str) return NULL;
+         if (str[0] != '~') return g_strdup (str);
+ 
+-        return g_strconcat (g_get_home_dir (), str + 1, NULL);
++        return g_strconcat (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir (), str + 1, NULL);
+ }
+ 
+ int

diff --git a/galeon-locale-names.patch b/galeon-locale-names.patch
index 356ea91cb5cfb88a19e32a208853a70decc29bda..083cc03d8643d32e9bc38e3317e37302ea7b21e1 100644 (file)
--- a/galeon-locale-names.patch
+++ b/galeon-locale-names.patch
@@ -5,8 +5,8 @@ diff -urN aa/galeon-1.3.13/configure.in galeon-1.3.13/configure.in
  dnl ******************************* 
  dnl Add the languages which your application supports here.
  
--ALL_LINGUAS="am az be bg ca cs da de el en_GB es et eu fi fr ga gl hr hu it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi wa zh_CN zh_TW"
-+ALL_LINGUAS="am az be bg ca cs da de el en_GB es et eu fi fr ga gl hr hu it ja ko lt lv mk ml mn ms nb nl nn pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi wa zh_CN zh_TW"
+-ALL_LINGUAS="am az be bg ca cs da de el en_CA en_GB es et eu fi fr ga gl hr hu it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi wa zh_CN zh_TW"
++ALL_LINGUAS="am az be bg ca cs da de el en_CA en_GB es et eu fi fr ga gl hr hu it ja ko lt lv mk ml mn ms nb nl nn pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi wa zh_CN zh_TW"
  GETTEXT_PACKAGE=galeon-2.0
  AC_SUBST(GETTEXT_PACKAGE)
  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the Gettext package name.])