From f1a1ce1cc271bda70164adcc7465e96a3c774fdb Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Sun, 16 Mar 2008 21:00:39 +0000
Subject: Try to fix the build on 1.8.

svn path=/trunk/; revision=8114
---
 embed/mozilla/EphyPromptService.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'embed/mozilla/EphyPromptService.h')

diff --git a/embed/mozilla/EphyPromptService.h b/embed/mozilla/EphyPromptService.h
index ffde73164..0c2b1fa02 100644
--- a/embed/mozilla/EphyPromptService.h
+++ b/embed/mozilla/EphyPromptService.h
@@ -22,12 +22,15 @@
 #define EPHY_PROMPT_SERVICE_H
 
 #include <nsIPromptService.h>
-#include <nsIPromptService2.h>
 
 #if HAVE_NSINONBLOCKINGALERTSERVICE_H
 #include <nsINonBlockingAlertService.h>
 #endif
 
+#ifdef ENABLE_AUTHPROMPT2
+#include <nsIPromptService2.h>
+#endif
+
 #define EPHY_PROMPT_SERVICE_IID				\
 { /* 6e8b90d4-78a6-41c5-98da-b1559a40d30d */		\
   0x6e8b90d4, 0x78a6, 0x41c5,				\
@@ -35,7 +38,12 @@
 
 #define EPHY_PROMPT_SERVICE_CLASSNAME	"Epiphany Prompt Service"
 
-class EphyPromptService : public nsIPromptService2
+class EphyPromptService :
+#ifdef ENABLE_AUTHPROMPT2
+                          public nsIPromptService2
+#else
+                          public nsIPromptService
+#endif
 #if HAVE_NSINONBLOCKINGALERTSERVICE_H
 			, public nsINonBlockingAlertService
 #endif
@@ -43,7 +51,9 @@ class EphyPromptService : public nsIPromptService2
 public:
 	NS_DECL_ISUPPORTS
 	NS_DECL_NSIPROMPTSERVICE
+#ifdef ENABLE_AUTHPROMPT2
 	NS_DECL_NSIPROMPTSERVICE2
+#endif
 #if HAVE_NSINONBLOCKINGALERTSERVICE_H
 	NS_DECL_NSINONBLOCKINGALERTSERVICE
 #endif
@@ -52,6 +62,7 @@ public:
 	virtual ~EphyPromptService();
 
  protected:
+#ifdef ENABLE_AUTHPROMPT2
 	static nsresult PromptPasswordAdapter(nsIPromptService* aService,
 					      nsIDOMWindow* aParent,
 					      nsIChannel* aChannel,
@@ -60,6 +71,7 @@ public:
 					      const PRUnichar* aCheckLabel,
 					      PRBool* aCheckValue,
 					      PRBool* retval);
+#endif /* ENABLE_AUTHPROMPT2 */
 };
 
 #endif /* EPHY_PROMPT_SERVICE_H */
-- 
cgit v1.2.3