aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/epiphany.in11
2 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 860d441b1..7dc4a3b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-20 Marco Pesenti Gritti <marco@gnome.org>
+
+ * src/epiphany.in:
+
+ Do not try to pickup already set MOZILLA_FIVE_HOME,
+ hopefully fix crashes oepning links from thunderbird
+
2003-12-20 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyAboutRedirector.cpp:
diff --git a/src/epiphany.in b/src/epiphany.in
index 443fe3814..9031d5925 100644
--- a/src/epiphany.in
+++ b/src/epiphany.in
@@ -2,21 +2,14 @@
dist_bin=`dirname $0`
-if test -n "$MOZILLA_FIVE_HOME"; then
- MOZILLA_HOME=$MOZILLA_FIVE_HOME
-elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
- MOZILLA_HOME=@MOZILLA_HOME@
-else
- echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
- exit
-fi
+MOZILLA_HOME=@MOZILLA_HOME@
if [ -z "$MOZ_PLUGIN_PATH" ]; then
MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins:/usr/libexec/plugins/mozilla
export MOZ_PLUGIN_PATH
fi
-#Migration
+# Migration
if [ ! -e $HOME/.gnome2/epiphany/mozilla/epiphany -a -d $HOME/.galeon/mozilla/galeon ]; then
mkdir -p $HOME/.gnome2/epiphany/mozilla/epiphany && \
cp $HOME/.galeon/mozilla/galeon/*.s \