- updated for 1.3.19

Changed files:
    galeon-home_etc.patch -> 1.7
    galeon-mozilla.patch -> 1.2

diff --git a/galeon-home_etc.patch b/galeon-home_etc.patch
index 1d04e6f796e21911c230197c43fb486e2672ee2b..ad59c6b50898a3b9993e041490064896a4cf22ac 100644 (file)
--- a/galeon-home_etc.patch
+++ b/galeon-home_etc.patch
@@ -230,6 +230,14 @@ diff -urN aa/galeon-1.3.17/libegg/egg-recent-model.c galeon-1.3.17/libegg/egg-re
 diff -urN aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp galeon-1.3.17/mozilla/mozilla-embed-shell.cpp
 --- aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp   2004-07-27 22:27:37.000000000 +0200
 +++ galeon-1.3.17/mozilla/mozilla-embed-shell.cpp      2004-08-10 15:05:41.881542768 +0200
+@@ -43,6 +43,7 @@
+ 
+ #include <time.h>
+ #include <glib/gi18n.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include <nsIConsoleService.h>
 @@ -339,7 +339,7 @@
  mozilla_init_profile (void)
  {
@@ -239,18 +247,6 @@ diff -urN aa/galeon-1.3.17/mozilla/mozilla-embed-shell.cpp galeon-1.3.17/mozilla
                                         MOZILLA_PROFILE_DIR, 
                                         NULL);
          gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
-diff -urN aa/galeon-1.3.17/mozilla/MyportalProtocolHandler.cpp galeon-1.3.17/mozilla/MyportalProtocolHandler.cpp
---- aa/galeon-1.3.17/mozilla/MyportalProtocolHandler.cpp       2004-07-14 22:33:47.000000000 +0200
-+++ galeon-1.3.17/mozilla/MyportalProtocolHandler.cpp  2004-08-10 15:05:50.315260648 +0200
-@@ -205,7 +205,7 @@
-       
-       /* open the rendering stream */
- #if USE_INTERMEDIATE_FILE
--      gchar *filename = g_strconcat (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 -urN aa/galeon-1.3.17/mozilla/ProgressListener.cpp galeon-1.3.17/mozilla/ProgressListener.cpp
 --- aa/galeon-1.3.17/mozilla/ProgressListener.cpp      2004-08-01 23:43:02.000000000 +0200
 +++ galeon-1.3.17/mozilla/ProgressListener.cpp 2004-08-10 15:05:55.201517824 +0200
@@ -263,27 +259,6 @@ diff -urN aa/galeon-1.3.17/mozilla/ProgressListener.cpp galeon-1.3.17/mozilla/Pr
        }
  
  
-diff -urN aa/galeon-1.3.17/mozilla/SideBar.cpp galeon-1.3.17/mozilla/SideBar.cpp
---- aa/galeon-1.3.17/mozilla/SideBar.cpp       2004-06-06 15:45:26.000000000 +0200
-+++ galeon-1.3.17/mozilla/SideBar.cpp  2004-08-10 15:06:03.224298176 +0200
-@@ -263,7 +263,7 @@
- 
- void GSidebar::LoadSidebarPages(void)
- {
--      gchar *filename = g_build_filename(g_get_home_dir(),
-+      gchar *filename = g_build_filename(getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
-                                          GALEON_DIR"/sidebars.xml",
-                                          NULL);
- 
-@@ -308,7 +308,7 @@
- 
- void GSidebar::SaveSidebarPages(void)
- {
--      gchar *filename = g_build_filename (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 -urN aa/galeon-1.3.17/src/galeon-favicon-cache.c galeon-1.3.17/src/galeon-favicon-cache.c
 --- aa/galeon-1.3.17/src/galeon-favicon-cache.c        2004-06-06 14:42:30.000000000 +0200
 +++ galeon-1.3.17/src/galeon-favicon-cache.c   2004-08-10 15:06:24.383081552 +0200
@@ -322,6 +297,18 @@ diff -urN aa/galeon-1.3.17/src/galeon-shell.c galeon-1.3.17/src/galeon-shell.c
                                       GALEON_DIR "/bookmarks.xbel", NULL);
        
        /* init the bookmark icon provider */
+diff -urN galeon-1.3.19/src/galeon-sidebars.c.orig galeon-1.3.19/src/galeon-sidebars.c
+--- galeon-1.3.19/src/galeon-sidebars.c.orig   2005-02-26 15:08:49.201988840 +0100
++++ galeon-1.3.19/src/galeon-sidebars.c        2005-02-26 15:09:15.635970264 +0100
+@@ -432,7 +432,7 @@
+       sidebars->priv = p;
+ 
+ 
+-      sidebars->priv->filename = g_build_filename(g_get_home_dir(),
++      sidebars->priv->filename = g_build_filename(getenv("HOME_ETC")!=NULL? getenv("HOME_ETC"): g_get_home_dir(),
+                                                   GALEON_DIR"/sidebars.xml",
+                                                   NULL);
+       galeon_sidebars_load (sidebars);
 diff -urN aa/galeon-1.3.17/src/migrate.c galeon-1.3.17/src/migrate.c
 --- aa/galeon-1.3.17/src/migrate.c     2004-07-04 11:41:53.000000000 +0200
 +++ galeon-1.3.17/src/migrate.c        2004-08-10 15:06:50.993036224 +0200
@@ -437,14 +424,14 @@ diff -urN aa/galeon-1.3.17/utils/gul-state.c galeon-1.3.17/utils/gul-state.c
 --- aa/galeon-1.3.17/utils/gul-state.c 2004-03-29 23:55:56.000000000 +0200
 +++ galeon-1.3.17/utils/gul-state.c    2004-08-10 15:07:22.590232720 +0200
 @@ -53,7 +53,7 @@
-       char *config_prefix;
+ #endif
  
        /* Using ~/.galeon/state.ini to keep all files together. */
--      state_file = g_build_filename (g_get_home_dir(),
-+      state_file = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
-                                      ".galeon", "state.ini", NULL);
+-      filename = g_build_filename (g_get_home_dir(),
++      filename = g_build_filename (getenv("HOME_ETC") ? getenv("HOME_ETC") : g_get_home_dir(),
+                                    ".galeon", "state.ini", NULL);
  
-       config_prefix = g_strconcat ("=", state_file, "=/", NULL);
+ #ifdef USE_GKEYFILE
 diff -urN aa/galeon-1.3.17/utils/gul-string.c galeon-1.3.17/utils/gul-string.c
 --- aa/galeon-1.3.17/utils/gul-string.c        2004-03-30 23:33:06.000000000 +0200
 +++ galeon-1.3.17/utils/gul-string.c   2004-08-10 15:07:29.456188936 +0200

diff --git a/galeon-mozilla.patch b/galeon-mozilla.patch
index 988c0378b4340772c9619c8fa9cc350e78cc9b0f..8c9e597b82ab6bb17f00e4f0f8531795da83f6b8 100644 (file)
--- a/galeon-mozilla.patch
+++ b/galeon-mozilla.patch
@@ -2,11 +2,11 @@ diff -urN aa/galeon-1.3.17/configure.in galeon-1.3.17/configure.in
 --- aa/galeon-1.3.17/configure.in      2004-08-07 22:42:52.000000000 +0200
 +++ galeon-1.3.17/configure.in 2004-08-22 23:47:13.501901936 +0200
 @@ -148,7 +148,7 @@
- MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir mozilla-gtkmozembed`"
+ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`"
  AC_SUBST(MOZILLA_INCLUDE_ROOT)
  
--MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
-+MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-plugin`"
+-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
++MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-plugin`"
  AC_SUBST(MOZILLA_HOME)
  
- dnl ################
+ AC_DEFINE(ENABLE_MOZILLA_EMBED, 1, [Define to 1 if you wish to enable the Mozilla renderer.])