diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 1 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 30 | ||||
| -rw-r--r-- | m4/gecko.m4 | 15 |
5 files changed, 35 insertions, 27 deletions
@@ -1,5 +1,19 @@ 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. + +2006-02-05 Christian Persch <chpe@cvs.gnome.org> + * src/window-commands.c: Show the backend in the about box. diff --git a/configure.ac b/configure.ac index 308e85334..eeb6a7756 100644 --- a/configure.ac +++ b/configure.ac @@ -177,7 +177,7 @@ seamonkey) min_version=1.0 ;; xulrunner) min_version=1.8 ;; esac -PKG_CHECK_MODULES([GECKO],[$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version]) +PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version $gecko_cv_extra_pkg_dependencies]) AC_SUBST([GECKO_CFLAGS]) AC_SUBST([GECKO_LIBS]) 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, diff --git a/m4/gecko.m4 b/m4/gecko.m4 index a6d456e5a..29c55bd41 100644 --- a/m4/gecko.m4 +++ b/m4/gecko.m4 @@ -81,16 +81,19 @@ fi if test "$gecko_cv_have_gecko" = "yes"; then +gecko_cv_extra_pkg_dependencies= + case "$gecko_cv_gecko" in -mozilla) gecko_cv_gecko_flavour=mozilla ;; -seamonkey) gecko_cv_gecko_flavour=mozilla ;; -*firefox) gecko_cv_gecko_flavour=toolkit ;; +mozilla) gecko_cv_gecko_flavour=mozilla gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;; +seamonkey) gecko_cv_gecko_flavour=mozilla gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;; +*firefox) gecko_cv_gecko_flavour=toolkit gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;; +XXxulrunner) gecko_cv_gecko_flavour=toolkit gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-gtkmozembed" ;; xulrunner) gecko_cv_gecko_flavour=toolkit ;; esac -_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-gtkmozembed`" -_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-gtkmozembed`" -_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-gtkmozembed`" +_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" fi # if gecko_cv_have_gecko |