galeon r8943 - in trunk: . mozilla

[philipl svn gnome org]

Author: philipl
Date: Sat Feb  2 22:29:50 2008
New Revision: 8943
URL: http://svn.gnome.org/viewvc/galeon?rev=8943&view=rev

Log:
2008-02-02  Philip Langdale  <philipl alumni utexas net>

	* configure.in
	* mozilla/mozilla-embed-shell.cpp: Gecko 1.9 doesn't
	support remembering passwords. We're really moving
	onwards and upwards here.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/mozilla/mozilla-embed-shell.cpp

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Feb  2 22:29:50 2008
@@ -1135,6 +1135,14 @@
 	[AC_DEFINE([HAVE_NSIMUTABLEARRAY_H],[1],
 	[Define if nsIClassInfoImpl.h exists])])
 
+dnl The password manager was removed from the C++ core in 1.9
+AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPassword.h],
+	[AC_DEFINE([HAVE_NSIPASSWORD_H],[1],
+	[Define if nsIPassword.h exists])])
+AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/necko/nsIPassword.h],
+	[AC_DEFINE([HAVE_NSIPASSWORD_H],[1],
+	[Define if nsIPassword.h exists])])
+
 dnl restore flags
 CXXFLAGS="$_SAVE_CXXFLAGS $MOZ_DEBUG_FLAGS"
 CPPFLAGS=$_SAVE_CPPFLAGS

Modified: trunk/mozilla/mozilla-embed-shell.cpp
==============================================================================
--- trunk/mozilla/mozilla-embed-shell.cpp	(original)
+++ trunk/mozilla/mozilla-embed-shell.cpp	Sat Feb  2 22:29:50 2008
@@ -63,8 +63,10 @@
 #include <nsIPermissionManager.h>
 #include <nsICookieManager.h>
 #include <nsIPermission.h>
+#ifdef HAVE_NSIPASSWORD_H
 #include <nsIPasswordManager.h>
 #include <nsIPassword.h>
+#endif
 #include <nsICookie.h>
 #include <nsCPasswordManager.h>
 #include <nsIObserverService.h>
@@ -755,6 +757,7 @@
 impl_list_passwords (GaleonEmbedShell *shell,
 		     PasswordType type)
 {
+#ifdef HAVE_NSIPASSWORD_H
         nsresult result = NS_ERROR_FAILURE;
 
         nsCOMPtr<nsIPasswordManager> passwordManager =
@@ -795,8 +798,10 @@
 
 		passwords = g_list_prepend (passwords, p);
         }       
-
 	return g_list_reverse (passwords);
+#else
+	return NULL;
+#endif
 }
 
 static void