diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 9 |
2 files changed, 11 insertions, 6 deletions
@@ -1,5 +1,13 @@ 2006-02-07 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/mozilla-embed-single.cpp: + + Remove workaround for broken profile now that + https://bugzilla.mozilla.org/show_bug.cgi?id=326013 + is fixed. + +2006-02-07 Christian Persch <chpe@cvs.gnome.org> + * lib/ephy-node.c: (ephy_node_new_from_xml): Save tons of g_type_from_name calls. diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index bdbe73c38..85084486a 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -452,9 +452,6 @@ mozilla_init_profile (void) char *profile_path; profile_path = g_build_filename (ephy_dot_dir (), MOZILLA_PROFILE_DIR, -#ifdef HAVE_GECKO_1_9 - "epiphany", -#endif NULL); gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME); g_free (profile_path); @@ -726,11 +723,11 @@ impl_init (EphyEmbedSingle *esingle) mozilla_init_profile (); - /* Set mozilla binary path */ - gtk_moz_embed_set_comp_path (MOZILLA_HOME); - #ifdef HAVE_GECKO_1_9 gtk_moz_embed_set_path (MOZILLA_HOME); +#else + /* Set mozilla binary path */ + gtk_moz_embed_set_comp_path (MOZILLA_HOME); #endif #if defined(HAVE_MOZILLA_TOOLKIT) && defined(HAVE_GECKO_1_8) |