aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-08-20 01:48:43 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-08-20 01:48:43 +0800
commit95e661f6e0a9b21b79bacfcd74fd9373df8d289a (patch)
tree3a6b42440a562b9f2530de0b158bc98839f759e6
parent26466a9edc6df383033a45b74627824bd75de858 (diff)
downloadgsoc2013-epiphany-95e661f6e0a9b21b79bacfcd74fd9373df8d289a.tar
gsoc2013-epiphany-95e661f6e0a9b21b79bacfcd74fd9373df8d289a.tar.gz
gsoc2013-epiphany-95e661f6e0a9b21b79bacfcd74fd9373df8d289a.tar.bz2
gsoc2013-epiphany-95e661f6e0a9b21b79bacfcd74fd9373df8d289a.tar.lz
gsoc2013-epiphany-95e661f6e0a9b21b79bacfcd74fd9373df8d289a.tar.xz
gsoc2013-epiphany-95e661f6e0a9b21b79bacfcd74fd9373df8d289a.tar.zst
gsoc2013-epiphany-95e661f6e0a9b21b79bacfcd74fd9373df8d289a.zip
Set mozilla binaries path before firing up.
2004-08-19 Marco Pesenti Gritti <marco@gnome.org> * embed/mozilla/Makefile.am: * embed/mozilla/mozilla-embed-single.cpp: Set mozilla binaries path before firing up.
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/Makefile.am1
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp5
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f757a433..870c7cfed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-19 Marco Pesenti Gritti <marco@gnome.org>
+
+ * embed/mozilla/Makefile.am:
+ * embed/mozilla/mozilla-embed-single.cpp:
+
+ Set mozilla binaries path before firing up.
+
2004-08-18 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-cell-renderer-progress.c:
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 89729f1f3..f309b0449 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -32,6 +32,7 @@ INCLUDES = \
-I$(MOZILLA_INCLUDE_ROOT)/xpcom \
$(EPIPHANY_DEPENDENCY_CFLAGS) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
+ -DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \
-DALLOW_PRIVATE_API
if MAINTAINER_MODE
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 66d6f54d1..356a83dc4 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -451,6 +451,9 @@ init_services (MozillaEmbedSingle *single)
mozilla_init_home ();
mozilla_init_profile ();
+ /* Set mozilla binary path */
+ gtk_moz_embed_set_comp_path (MOZILLA_HOME);
+
/* Fire up the beast */
gtk_moz_embed_push_startup ();
@@ -499,6 +502,8 @@ mozilla_embed_single_init (MozillaEmbedSingle *mes)
{
GtkWidget *dialog;
+ /* FIXME Kill references to MOZILLA_FIVE_HOME
+ when string freeze is over */
dialog = gtk_message_dialog_new
(NULL,
GTK_DIALOG_MODAL,