Move components from embed/ to components/ and fix the build.

svn path=/trunk/; revision=7431

42 files changed, 90 insertions, 69 deletions

diff --git a/embed/xulrunner/Makefile.am b/embed/xulrunner/Makefile.am
index dae0012f1..3392b8e96 100644
--- a/embed/xulrunner/Makefile.am
+++ b/embed/xulrunner/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = utils src components embed data bindings
+SUBDIRS = utils src embed components data bindings
 # SUBDIRS += tests
 
 NULL =
diff --git a/embed/xulrunner/embed/ContentHandler.cpp b/embed/xulrunner/components/ContentHandler.cpp
index 051f5e077..051f5e077 100644
--- a/embed/xulrunner/embed/ContentHandler.cpp
+++ b/embed/xulrunner/components/ContentHandler.cpp
diff --git a/embed/xulrunner/embed/ContentHandler.h b/embed/xulrunner/components/ContentHandler.h
index 113e29070..113e29070 100644
--- a/embed/xulrunner/embed/ContentHandler.h
+++ b/embed/xulrunner/components/ContentHandler.h
diff --git a/embed/xulrunner/embed/EphyAboutModule.cpp b/embed/xulrunner/components/EphyAboutModule.cpp
index 78ce93bec..78ce93bec 100644
--- a/embed/xulrunner/embed/EphyAboutModule.cpp
+++ b/embed/xulrunner/components/EphyAboutModule.cpp
diff --git a/embed/xulrunner/embed/EphyAboutModule.h b/embed/xulrunner/components/EphyAboutModule.h
index 21a269c49..21a269c49 100644
--- a/embed/xulrunner/embed/EphyAboutModule.h
+++ b/embed/xulrunner/components/EphyAboutModule.h
diff --git a/embed/xulrunner/embed/EphyContentPolicy.cpp b/embed/xulrunner/components/EphyContentPolicy.cpp
index 7f8943687..7f8943687 100644
--- a/embed/xulrunner/embed/EphyContentPolicy.cpp
+++ b/embed/xulrunner/components/EphyContentPolicy.cpp
diff --git a/embed/xulrunner/embed/EphyContentPolicy.h b/embed/xulrunner/components/EphyContentPolicy.h
index 0bc68ced7..0bc68ced7 100644
--- a/embed/xulrunner/embed/EphyContentPolicy.h
+++ b/embed/xulrunner/components/EphyContentPolicy.h
diff --git a/embed/xulrunner/embed/EphyRedirectChannel.cpp b/embed/xulrunner/components/EphyRedirectChannel.cpp
index af6dd2f91..af6dd2f91 100644
--- a/embed/xulrunner/embed/EphyRedirectChannel.cpp
+++ b/embed/xulrunner/components/EphyRedirectChannel.cpp
diff --git a/embed/xulrunner/embed/EphyRedirectChannel.h b/embed/xulrunner/components/EphyRedirectChannel.h
index bcec1f1e5..bcec1f1e5 100644
--- a/embed/xulrunner/embed/EphyRedirectChannel.h
+++ b/embed/xulrunner/components/EphyRedirectChannel.h
diff --git a/embed/xulrunner/embed/EphySidebar.cpp b/embed/xulrunner/components/EphySidebar.cpp
index 1225e2d9a..1225e2d9a 100644
--- a/embed/xulrunner/embed/EphySidebar.cpp
+++ b/embed/xulrunner/components/EphySidebar.cpp
diff --git a/embed/xulrunner/embed/EphySidebar.h b/embed/xulrunner/components/EphySidebar.h
index 37efa0bf8..37efa0bf8 100644
--- a/embed/xulrunner/embed/EphySidebar.h
+++ b/embed/xulrunner/components/EphySidebar.h
diff --git a/embed/xulrunner/embed/FilePicker.cpp b/embed/xulrunner/components/FilePicker.cpp
index e452dd0a7..e452dd0a7 100644
--- a/embed/xulrunner/embed/FilePicker.cpp
+++ b/embed/xulrunner/components/FilePicker.cpp
diff --git a/embed/xulrunner/embed/FilePicker.h b/embed/xulrunner/components/FilePicker.h
index fa63c56b1..fa63c56b1 100644
--- a/embed/xulrunner/embed/FilePicker.h
+++ b/embed/xulrunner/components/FilePicker.h
diff --git a/embed/xulrunner/embed/GeckoCookiePromptService.cpp b/embed/xulrunner/components/GeckoCookiePromptService.cpp
index 4fc7c21a6..4fc7c21a6 100644
--- a/embed/xulrunner/embed/GeckoCookiePromptService.cpp
+++ b/embed/xulrunner/components/GeckoCookiePromptService.cpp
diff --git a/embed/xulrunner/embed/GeckoCookiePromptService.h b/embed/xulrunner/components/GeckoCookiePromptService.h
index 7092a2982..7092a2982 100644
--- a/embed/xulrunner/embed/GeckoCookiePromptService.h
+++ b/embed/xulrunner/components/GeckoCookiePromptService.h
diff --git a/embed/xulrunner/embed/GeckoFormSigningDialog.cpp b/embed/xulrunner/components/GeckoFormSigningDialog.cpp
index 55b9d0d37..55b9d0d37 100644
--- a/embed/xulrunner/embed/GeckoFormSigningDialog.cpp
+++ b/embed/xulrunner/components/GeckoFormSigningDialog.cpp
diff --git a/embed/xulrunner/embed/GeckoFormSigningDialog.h b/embed/xulrunner/components/GeckoFormSigningDialog.h
index a4438e9d1..a4438e9d1 100644
--- a/embed/xulrunner/embed/GeckoFormSigningDialog.h
+++ b/embed/xulrunner/components/GeckoFormSigningDialog.h
diff --git a/embed/xulrunner/embed/GeckoPrintService.cpp b/embed/xulrunner/components/GeckoPrintService.cpp
index b1d34a960..b1d34a960 100644
--- a/embed/xulrunner/embed/GeckoPrintService.cpp
+++ b/embed/xulrunner/components/GeckoPrintService.cpp
diff --git a/embed/xulrunner/embed/GeckoPrintService.h b/embed/xulrunner/components/GeckoPrintService.h
index c2e21cf3e..c2e21cf3e 100644
--- a/embed/xulrunner/embed/GeckoPrintService.h
+++ b/embed/xulrunner/components/GeckoPrintService.h
diff --git a/embed/xulrunner/embed/GeckoPrintSession.cpp b/embed/xulrunner/components/GeckoPrintSession.cpp
index e0c3b89e9..e0c3b89e9 100644
--- a/embed/xulrunner/embed/GeckoPrintSession.cpp
+++ b/embed/xulrunner/components/GeckoPrintSession.cpp
diff --git a/embed/xulrunner/embed/GeckoPrintSession.h b/embed/xulrunner/components/GeckoPrintSession.h
index 027f01e23..027f01e23 100644
--- a/embed/xulrunner/embed/GeckoPrintSession.h
+++ b/embed/xulrunner/components/GeckoPrintSession.h
diff --git a/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp b/embed/xulrunner/components/GeckoSpellCheckEngine.cpp
index 0b1257b41..0b1257b41 100644
--- a/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp
+++ b/embed/xulrunner/components/GeckoSpellCheckEngine.cpp
diff --git a/embed/xulrunner/embed/GeckoSpellCheckEngine.h b/embed/xulrunner/components/GeckoSpellCheckEngine.h
index b70f6c970..b70f6c970 100644
--- a/embed/xulrunner/embed/GeckoSpellCheckEngine.h
+++ b/embed/xulrunner/components/GeckoSpellCheckEngine.h
diff --git a/embed/xulrunner/embed/GlobalHistory.cpp b/embed/xulrunner/components/GlobalHistory.cpp
index a2fd79960..a2fd79960 100644
--- a/embed/xulrunner/embed/GlobalHistory.cpp
+++ b/embed/xulrunner/components/GlobalHistory.cpp
diff --git a/embed/xulrunner/embed/GlobalHistory.h b/embed/xulrunner/components/GlobalHistory.h
index 8397874a0..8397874a0 100644
--- a/embed/xulrunner/embed/GlobalHistory.h
+++ b/embed/xulrunner/components/GlobalHistory.h
diff --git a/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp b/embed/xulrunner/components/GtkNSSClientAuthDialogs.cpp
index 12b74573f..12b74573f 100644
--- a/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp
+++ b/embed/xulrunner/components/GtkNSSClientAuthDialogs.cpp
diff --git a/embed/xulrunner/embed/GtkNSSClientAuthDialogs.h b/embed/xulrunner/components/GtkNSSClientAuthDialogs.h
index 0aa582700..0aa582700 100644
--- a/embed/xulrunner/embed/GtkNSSClientAuthDialogs.h
+++ b/embed/xulrunner/components/GtkNSSClientAuthDialogs.h
diff --git a/embed/xulrunner/embed/GtkNSSDialogs.cpp b/embed/xulrunner/components/GtkNSSDialogs.cpp
index 51581f8db..51581f8db 100644
--- a/embed/xulrunner/embed/GtkNSSDialogs.cpp
+++ b/embed/xulrunner/components/GtkNSSDialogs.cpp
diff --git a/embed/xulrunner/embed/GtkNSSDialogs.h b/embed/xulrunner/components/GtkNSSDialogs.h
index 2edd1ffbe..2edd1ffbe 100644
--- a/embed/xulrunner/embed/GtkNSSDialogs.h
+++ b/embed/xulrunner/components/GtkNSSDialogs.h
diff --git a/embed/xulrunner/embed/GtkNSSKeyPairDialogs.cpp b/embed/xulrunner/components/GtkNSSKeyPairDialogs.cpp
index ac3afdfde..ac3afdfde 100644
--- a/embed/xulrunner/embed/GtkNSSKeyPairDialogs.cpp
+++ b/embed/xulrunner/components/GtkNSSKeyPairDialogs.cpp
diff --git a/embed/xulrunner/embed/GtkNSSKeyPairDialogs.h b/embed/xulrunner/components/GtkNSSKeyPairDialogs.h
index f4b92d9e1..f4b92d9e1 100644
--- a/embed/xulrunner/embed/GtkNSSKeyPairDialogs.h
+++ b/embed/xulrunner/components/GtkNSSKeyPairDialogs.h
diff --git a/embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.cpp b/embed/xulrunner/components/GtkNSSSecurityWarningDialogs.cpp
index 08f5e664a..08f5e664a 100644
--- a/embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/xulrunner/components/GtkNSSSecurityWarningDialogs.cpp
diff --git a/embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.h b/embed/xulrunner/components/GtkNSSSecurityWarningDialogs.h
index a84ea6585..a84ea6585 100644
--- a/embed/xulrunner/embed/GtkNSSSecurityWarningDialogs.h
+++ b/embed/xulrunner/components/GtkNSSSecurityWarningDialogs.h
diff --git a/embed/xulrunner/components/Makefile.am b/embed/xulrunner/components/Makefile.am
index 53796b169..ad9b5f348 100644
--- a/embed/xulrunner/components/Makefile.am
+++ b/embed/xulrunner/components/Makefile.am
@@ -3,11 +3,75 @@ NULL =
 noinst_LTLIBRARIES = libephycomponents.la
 
 libephycomponents_la_SOURCES = \
-	GeckoPromptService.cpp			\
-	GeckoPromptService.h			\
+	ContentHandler.cpp		\
+	ContentHandler.h		\
+	EphyAboutModule.cpp		\
+	EphyAboutModule.h		\
+	EphyContentPolicy.cpp		\
+	EphyContentPolicy.h		\
+	EphyRedirectChannel.cpp		\
+	EphyRedirectChannel.h		\
+	EphySidebar.cpp			\
+	EphySidebar.h			\
+	GeckoCookiePromptService.cpp	\
+	GeckoCookiePromptService.h	\
+	GeckoFormSigningDialog.cpp	\
+	GeckoFormSigningDialog.h	\
+	GeckoPrintService.cpp		\
+	GeckoPrintService.h		\
+	GeckoPrintSession.cpp		\
+	GeckoPrintSession.h		\
+	GeckoPromptService.cpp		\
+	GeckoPromptService.h		\
+	GlobalHistory.cpp               \
+	GlobalHistory.h                 \
+	MozDownload.cpp			\
+	MozDownload.h			\
+	MozRegisterComponents.cpp       \
+	MozRegisterComponents.h         \
 	$(NULL)
 
+# if ENABLE_FILEPICKER
+# libephycomponents_la_SOURCES += 	\
+# 	FilePicker.cpp			\
+# 	FilePicker.h
+# endif
+
+# NOTE & FIXME: Most of these are GPL not LGPL
+# if HAVE_MOZILLA_PSM
+libephycomponents_la_SOURCES += 	\
+	GtkNSSClientAuthDialogs.cpp	\
+	GtkNSSClientAuthDialogs.h	\
+	GtkNSSDialogs.cpp		\
+	GtkNSSDialogs.h			\
+	GtkNSSKeyPairDialogs.cpp	\
+	GtkNSSKeyPairDialogs.h		\
+	GtkNSSSecurityWarningDialogs.cpp\
+	GtkNSSSecurityWarningDialogs.h
+# endif
+
+# if ENABLE_SPELLCHECKER
+libephycomponents_la_SOURCES += \
+	GeckoSpellCheckEngine.cpp	\
+	GeckoSpellCheckEngine.h
+# endif
+
 libephycomponents_la_CPPFLAGS = \
+	-I$(top_srcdir)/lib	    		\
+	-I$(top_srcdir)/embed	    		\
+	-I$(top_srcdir)		    		\
+	-I$(top_srcdir)/embed/xulrunner/src	\
+	-I$(top_srcdir)/embed/xulrunner/embed	\
+	-I$(top_srcdir)/embed/xulrunner/utils	\
+	-I$(top_builddir)/embed/xulrunner/src	\
+	-I$(top_builddir)/embed/xulrunner/embed	\
+	-DSHARE_DIR=\"$(pkgdatadir)\"   	\
+	-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\"		\
+	-DMOZILLA_HOME=\"$(LIBXUL_LIBDIR)\"	\
+	-DMOZILLA_PREFIX=\"$(LIBXUL_PREFIX)\"	\
+	-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\"		\
+	-DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\"	\
+	-DALLOW_PRIVATE_API			\
 	$(LIBXUL_CXXCPPFLAGS)	\
 	$(LIBXUL_INCLUDES)	\
 	$(AM_CPPFLAGS)
@@ -15,6 +79,11 @@ libephycomponents_la_CPPFLAGS = \
 libephycomponents_la_CXXFLAGS = \
 	$(LIBXUL_CXXFLAGS)	\
 	$(GTK_CFLAGS)		\
+	$(GTKPRINT_CFLAGS)	\
+	$(GNOMEVFS_CFLAGS)	\
+	$(GCONF_CFLAGS)		\
+	$(GLADE_CFLAGS)		\
+	$(GNOME_CFLAGS)		\
 	$(AM_CXXFLAGS)
 
 libephycomponents_la_LDFLAGS = \
diff --git a/embed/xulrunner/embed/MozDownload.cpp b/embed/xulrunner/components/MozDownload.cpp
index d6d28ec59..d6d28ec59 100644
--- a/embed/xulrunner/embed/MozDownload.cpp
+++ b/embed/xulrunner/components/MozDownload.cpp
diff --git a/embed/xulrunner/embed/MozDownload.h b/embed/xulrunner/components/MozDownload.h
index 27fef41c7..27fef41c7 100644
--- a/embed/xulrunner/embed/MozDownload.h
+++ b/embed/xulrunner/components/MozDownload.h
diff --git a/embed/xulrunner/embed/MozRegisterComponents.cpp b/embed/xulrunner/components/MozRegisterComponents.cpp
index 69490d19d..0ff0014d7 100644
--- a/embed/xulrunner/embed/MozRegisterComponents.cpp
+++ b/embed/xulrunner/components/MozRegisterComponents.cpp
@@ -1,7 +1,7 @@
 /*
  *  Copyright © 2001,2002,2003 Philip Langdale
  *  Copyright © 2003 Marco Pesenti Gritti
- *  Copyright © 2004, 2005, 2006 Christian Persch
+ *  Copyright © 2004, 2005, 2006, 2007 Christian Persch
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,6 +43,8 @@
 #include <nsNetCID.h>
 #include <nsServiceManagerUtils.h>
 
+#define HAVE_MOZILLA_PSM
+
 #ifdef HAVE_MOZILLA_PSM
 #include <nsISecureBrowserUI.h>
 #endif
@@ -50,11 +52,11 @@
 #include "ContentHandler.h"
 #include "EphyAboutModule.h"
 #include "EphyContentPolicy.h"
-#include "EphyPromptService.h"
 #include "EphySidebar.h"
 #include "GeckoCookiePromptService.h"
 #include "GeckoPrintService.h"
 #include "GeckoPrintSession.h"
+#include "GeckoPromptService.h"
 #include "GlobalHistory.h"
 #include "MozDownload.h"
 
@@ -76,12 +78,12 @@
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphyAboutModule)
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphyContentPolicy)
-NS_GENERIC_FACTORY_CONSTRUCTOR(EphyPromptService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphySidebar)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GContentHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GeckoCookiePromptService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GeckoPrintService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GeckoPrintSession)
+NS_GENERIC_FACTORY_CONSTRUCTOR(GeckoPromptService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(MozDownload)
 NS_GENERIC_FACTORY_CONSTRUCTOR(MozGlobalHistory)
 
@@ -247,19 +249,17 @@ static const nsModuleComponentInfo sAppComps[] = {
 		EphyAboutModuleConstructor
 	},
 	{
-		EPHY_PROMPT_SERVICE_CLASSNAME,
-		EPHY_PROMPT_SERVICE_IID,
+		GECKO_PROMPT_SERVICE_CLASSNAME,
+		GECKO_PROMPT_SERVICE_CID,
 		"@mozilla.org/embedcomp/prompt-service;1",
-		EphyPromptServiceConstructor
+		GeckoPromptServiceConstructor
 	},
-#ifdef HAVE_NSINONBLOCKINGALERTSERVICE_H
 	{
-		EPHY_PROMPT_SERVICE_CLASSNAME,
-		EPHY_PROMPT_SERVICE_IID,
+		GECKO_PROMPT_SERVICE_CLASSNAME,
+		GECKO_PROMPT_SERVICE_CID,
 		"@mozilla.org/embedcomp/nbalert-service;1",
-		EphyPromptServiceConstructor
+		GeckoPromptServiceConstructor
 	},
-#endif /* HAVE_NSINONBLOCKINGALERTSERVICE_H */
 #ifdef ENABLE_SPELLCHECKER
 	{
 		GECKO_SPELL_CHECK_ENGINE_CLASSNAME,
diff --git a/embed/xulrunner/embed/MozRegisterComponents.h b/embed/xulrunner/components/MozRegisterComponents.h
index e8e086f3b..e8e086f3b 100644
--- a/embed/xulrunner/embed/MozRegisterComponents.h
+++ b/embed/xulrunner/components/MozRegisterComponents.h
diff --git a/embed/xulrunner/embed/Makefile.am b/embed/xulrunner/embed/Makefile.am
index c02dc6efc..a2149a79b 100644
--- a/embed/xulrunner/embed/Makefile.am
+++ b/embed/xulrunner/embed/Makefile.am
@@ -1,14 +1,6 @@
 noinst_LTLIBRARIES = libephyxulrunnerembed.la
 
 libephyxulrunnerembed_la_SOURCES = 	\
-	ContentHandler.cpp		\
-	ContentHandler.h		\
-	EphyAboutModule.cpp		\
-	EphyAboutModule.h		\
-	EphyBadCertRejector.cpp		\
-	EphyBadCertRejector.h		\
-	EphyContentPolicy.cpp		\
-	EphyContentPolicy.h		\
 	EphyDirectoryProvider.cpp       \
 	EphyDirectoryProvider.h		\
 	EphyHeaderSniffer.cpp		\
@@ -19,30 +11,12 @@ libephyxulrunnerembed_la_SOURCES = 	\
 	EphyFind.h			\
 	EphyHistoryListener.cpp		\
 	EphyHistoryListener.h		\
-	EphyRedirectChannel.cpp		\
-	EphyRedirectChannel.h		\
-	EphySidebar.cpp			\
-	EphySidebar.h			\
 	EphySingle.cpp			\
 	EphySingle.h			\
 	EphyUtils.cpp			\
 	EphyUtils.h			\
 	EventContext.cpp                \
 	EventContext.h                  \
-	GeckoCookiePromptService.cpp	\
-	GeckoCookiePromptService.h	\
-	GeckoFormSigningDialog.cpp	\
-	GeckoFormSigningDialog.h	\
-	GeckoPrintService.cpp		\
-	GeckoPrintService.h		\
-	GeckoPrintSession.cpp		\
-	GeckoPrintSession.h		\
-	GlobalHistory.cpp               \
-	GlobalHistory.h                 \
-	MozDownload.cpp			\
-	MozDownload.h			\
-	MozRegisterComponents.cpp       \
-	MozRegisterComponents.h         \
 	mozilla-download.cpp		\
 	mozilla-download.h		\
 	mozilla-embed.cpp	        \
@@ -58,42 +32,18 @@ libephyxulrunnerembed_la_SOURCES = 	\
 	mozilla-notifiers.cpp		\
 	mozilla-notifiers.h
 
-# if ENABLE_FILEPICKER
-# libephyxulrunnerembed_la_SOURCES += 	\
-# 	FilePicker.cpp			\
-# 	FilePicker.h
-# endif
-
-# if HAVE_MOZILLA_PSM
-libephyxulrunnerembed_la_SOURCES += 	\
-	GtkNSSClientAuthDialogs.cpp	\
-	GtkNSSClientAuthDialogs.h	\
-	GtkNSSDialogs.cpp		\
-	GtkNSSDialogs.h			\
-	GtkNSSKeyPairDialogs.cpp	\
-	GtkNSSKeyPairDialogs.h		\
-	GtkNSSSecurityWarningDialogs.cpp\
-	GtkNSSSecurityWarningDialogs.h
-# endif
-
 # if ENABLE_CERTIFICATE_MANAGER
 # libephyxulrunnerembed_la_SOURCES += \
 # 	mozilla-x509-cert.cpp		\
 # 	mozilla-x509-cert.h
 # endif
 
-# if ENABLE_SPELLCHECKER
-libephyxulrunnerembed_la_SOURCES += \
-	GeckoSpellCheckEngine.cpp	\
-	GeckoSpellCheckEngine.h
-# endif
-
 libephyxulrunnerembed_la_CPPFLAGS = \
 	-I$(top_srcdir)/lib	    		\
 	-I$(top_srcdir)/embed	    		\
-	-I$(top_srcdir)		    		\
 	-I$(top_srcdir)/embed/xulrunner/src	\
 	-I$(top_srcdir)/embed/xulrunner/utils	\
+	-I$(top_srcdir)/embed/xulrunner/components	\
 	-I$(top_builddir)/embed/xulrunner/src	\
 	-DSHARE_DIR=\"$(pkgdatadir)\"   	\
 	-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\"		\
diff --git a/embed/xulrunner/embed/EphyBadCertRejector.cpp b/embed/xulrunner/utils/EphyBadCertRejector.cpp
index 5aad7d92f..5aad7d92f 100644
--- a/embed/xulrunner/embed/EphyBadCertRejector.cpp
+++ b/embed/xulrunner/utils/EphyBadCertRejector.cpp
diff --git a/embed/xulrunner/embed/EphyBadCertRejector.h b/embed/xulrunner/utils/EphyBadCertRejector.h
index dcab75c6c..dcab75c6c 100644
--- a/embed/xulrunner/embed/EphyBadCertRejector.h
+++ b/embed/xulrunner/utils/EphyBadCertRejector.h
diff --git a/embed/xulrunner/utils/Makefile.am b/embed/xulrunner/utils/Makefile.am
index 5d6fe699d..faeab4716 100644
--- a/embed/xulrunner/utils/Makefile.am
+++ b/embed/xulrunner/utils/Makefile.am
@@ -3,10 +3,12 @@ NULL =
 noinst_LTLIBRARIES = libephyxulrunnerutils.la
 
 libephyxulrunnerutils_la_SOURCES = \
-	AutoJSContextStack.cpp			\
-	AutoJSContextStack.h			\
-	AutoWindowModalState.cpp		\
-	AutoWindowModalState.h			\
+	AutoJSContextStack.cpp		\
+	AutoJSContextStack.h		\
+	AutoWindowModalState.cpp	\
+	AutoWindowModalState.h		\
+	EphyBadCertRejector.cpp		\
+	EphyBadCertRejector.h		\
 	$(NULL)
 
 libephyxulrunnerutils_la_CPPFLAGS = \