aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-02-06 06:42:45 +0800
committerChristian Persch <chpe@src.gnome.org>2006-02-06 06:42:45 +0800
commit2edc02176220d96d6386c500afaf4a680dc3a3b9 (patch)
tree85fb4c46e0bdd071208bc19bdf2c67e7609954d8 /embed/mozilla
parent0ce928e64a5739138599f82b69a4e43b2634df95 (diff)
downloadgsoc2013-epiphany-2edc02176220d96d6386c500afaf4a680dc3a3b9.tar
gsoc2013-epiphany-2edc02176220d96d6386c500afaf4a680dc3a3b9.tar.gz
gsoc2013-epiphany-2edc02176220d96d6386c500afaf4a680dc3a3b9.tar.bz2
gsoc2013-epiphany-2edc02176220d96d6386c500afaf4a680dc3a3b9.tar.lz
gsoc2013-epiphany-2edc02176220d96d6386c500afaf4a680dc3a3b9.tar.xz
gsoc2013-epiphany-2edc02176220d96d6386c500afaf4a680dc3a3b9.tar.zst
gsoc2013-epiphany-2edc02176220d96d6386c500afaf4a680dc3a3b9.zip
Changes to support xulrunner trunk (gecko 1.9).
2006-02-05 Christian Persch <chpe@cvs.gnome.org> * m4/gecko.m4: * configure.ac: * embed/mozilla/Makefile.am: Changes to support xulrunner trunk (gecko 1.9). * embed/mozilla/mozilla-embed-single.cpp: Go back to continuing after failed GetPassword; fixes getting the password list in case one item is corrupted.
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/Makefile.am1
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp30
2 files changed, 11 insertions, 20 deletions
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 3b118e01d..5658c8571 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -104,6 +104,7 @@ mozilla_include_subdirs = \
fastfind \
helperAppDlg \
gfx \
+ gtkembedmoz \
history \
js \
layout \
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 23805315a..bdbe73c38 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -446,21 +446,15 @@ mozilla_init_single (MozillaEmbedSingle *mes)
mes);
}
-static void
-mozilla_init_home (void)
-{
- char *mozilla_five_home;
- mozilla_five_home = g_strdup (g_getenv ("MOZILLA_FIVE_HOME"));
- gtk_moz_embed_set_comp_path (mozilla_five_home);
- g_free (mozilla_five_home);
-}
-
void
mozilla_init_profile (void)
{
char *profile_path;
profile_path = g_build_filename (ephy_dot_dir (),
- MOZILLA_PROFILE_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);
@@ -729,12 +723,16 @@ impl_init (EphyEmbedSingle *esingle)
/* Pre initialization */
mozilla_init_plugin_path ();
- mozilla_init_home ();
+
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);
+#endif
+
#if defined(HAVE_MOZILLA_TOOLKIT) && defined(HAVE_GECKO_1_8)
nsCOMPtr<nsIDirectoryServiceProvider> dp = new EphyDirectoryProvider ();
@@ -1067,15 +1065,7 @@ impl_list_passwords (EphyPasswordManager *manager)
NS_CSTRING_ENCODING_UTF8, userName);
rv = nsPassword->GetPassword (unicodeName);
- if (NS_FAILED (rv))
- {
- /* this usually means we couldn't decrypt the password, due to
- * the master password being unavailable. Don't continue since that
- * would lead to endless prompting for the master password; abort
- * instead.
- */
- break;
- }
+ if (NS_FAILED (rv)) continue;
nsEmbedCString userPassword;
NS_UTF16ToCString (unicodeName,