From 180f450c052cfdf9450fdffdb0bb0f5f971f5a19 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Sat, 12 Aug 2006 15:40:00 +0000
Subject: nsIPassword.h is always available. Fixes bug #350997.

2006-08-12  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/mozilla-embed-single.cpp:

	nsIPassword.h is always available. Fixes bug #350997.
---
 ChangeLog                              | 6 ++++++
 embed/mozilla/mozilla-embed-single.cpp | 8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e736789e1..c3780f847 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-12  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/mozilla/mozilla-embed-single.cpp:
+
+	nsIPassword.h is always available. Fixes bug #350997.
+
 2006-08-10  Christian Persch  <chpe@cvs.gnome.org>
 
 	* plugins/desktop-file/plugin.cpp:
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 4c2786632..3d23a6b46 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -44,6 +44,7 @@
 #include <nsIFile.h>
 #include <nsIIOService.h>
 #include <nsILocalFile.h>
+#include <nsIPassword.h>
 #include <nsIPasswordManager.h>
 #include <nsIPermission.h>
 #include <nsIPermissionManager.h>
@@ -60,10 +61,6 @@
 #include <nsIX509CertDB.h>
 #endif
 
-#ifdef HAVE_NSIPASSWORD_H
-#include <nsIPassword.h>
-#endif
-
 #ifdef ALLOW_PRIVATE_API
 #include <nsICacheService.h>
 #include <nsIFontEnumerator.h>
@@ -879,9 +876,7 @@ impl_list_passwords (EphyPasswordManager *manager)
 {
 	GList *passwords = NULL;
 
-#ifdef HAVE_NSIPASSWORD_H
 	nsresult rv;
-
 	nsCOMPtr<nsIPasswordManager> passwordManager =
 			do_GetService (NS_PASSWORDMANAGER_CONTRACTID);
 	if (!passwordManager) return NULL;
@@ -933,7 +928,6 @@ impl_list_passwords (EphyPasswordManager *manager)
 
 		passwords = g_list_prepend (passwords, p);
 	}
-#endif
 
 	return passwords;
 }
-- 
cgit v1.2.3