Merge external protocols in one file (implementation is just one macro).

2003-07-06  Marco Pesenti Gritti  <marco@it.gnome.org>

	* embed/mozilla/ExternalProtocolHandlers.cpp:
	* embed/mozilla/ExternalProtocolHandlers.h:
	* embed/mozilla/FtpProtocolHandler.cpp:
	* embed/mozilla/FtpProtocolHandler.h:
	* embed/mozilla/IRCProtocolHandler.cpp:
	* embed/mozilla/IRCProtocolHandler.h:
	* embed/mozilla/MailtoProtocolHandler.cpp:
	* embed/mozilla/MailtoProtocolHandler.h:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/MozRegisterComponents.cpp:

	Merge external protocols in one file (implementation
	is just one macro).
	Add a news:// handler.

10 files changed, 164 insertions, 217 deletions

diff --git a/ChangeLog b/ChangeLog
index bbe9cb850..272b4df98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2003-07-06  Marco Pesenti Gritti  <marco@it.gnome.org>
 
+	* embed/mozilla/ExternalProtocolHandlers.cpp:
+	* embed/mozilla/ExternalProtocolHandlers.h:
+	* embed/mozilla/FtpProtocolHandler.cpp:
+	* embed/mozilla/FtpProtocolHandler.h:
+	* embed/mozilla/IRCProtocolHandler.cpp:
+	* embed/mozilla/IRCProtocolHandler.h:
+	* embed/mozilla/MailtoProtocolHandler.cpp:
+	* embed/mozilla/MailtoProtocolHandler.h:
+	* embed/mozilla/Makefile.am:
+	* embed/mozilla/MozRegisterComponents.cpp:
+
+	Merge external protocols in one file (implementation
+	is just one macro).
+	Add a news:// handler.
+
+2003-07-06  Marco Pesenti Gritti  <marco@it.gnome.org>
+
 	* lib/egg/eggtreemodelfilter.c:
 
 	Patch by kris to speed it up.
diff --git a/embed/mozilla/MailtoProtocolHandler.cpp b/embed/mozilla/ExternalProtocolHandlers.cpp
index 42ab590ac..ff6f2a941 100644
--- a/embed/mozilla/MailtoProtocolHandler.cpp
+++ b/embed/mozilla/ExternalProtocolHandlers.cpp
@@ -16,8 +16,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include "MailtoProtocolHandler.h"
+#include "ExternalProtocolHandlers.h"
 
-/* Implementation file */
+NS_IMPL_ISUPPORTS2 (GIRCProtocolHandler, nsIProtocolHandler, nsIContentHandler)
+NS_IMPL_ISUPPORTS2 (GFtpProtocolHandler, nsIProtocolHandler, nsIContentHandler)
 NS_IMPL_ISUPPORTS2 (GMailtoProtocolHandler, nsIProtocolHandler, nsIContentHandler)
-
+NS_IMPL_ISUPPORTS2 (GNewsProtocolHandler, nsIProtocolHandler, nsIContentHandler)
diff --git a/embed/mozilla/ExternalProtocolHandlers.h b/embed/mozilla/ExternalProtocolHandlers.h
new file mode 100644
index 000000000..e2a47ef13
--- /dev/null
+++ b/embed/mozilla/ExternalProtocolHandlers.h
@@ -0,0 +1,127 @@
+/*
+ *  Copyright (C) 2001 Philip Langdale
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef EXTERNAL_PROTOCOL_HANDLERS
+#define EXTERNAL_PROTOCOL_HANDLERS
+
+#include "nsError.h"
+#include "BaseProtocolContentHandler.h"
+#include "nsIProtocolHandler.h"
+#include "nsCURILoader.h"
+
+#define G_IRC_PROTOCOL_CID			     \
+{ /* aabe33d3-7455-4d8f-87e7-43e4541ace4e */         \
+    0xaabe33d3,                                      \
+    0x7455,                                          \
+    0x4d8f,                                          \
+    {0x87, 0xe7, 0x43, 0xe4, 0x54, 0x1a, 0xce, 0x4e} \
+}
+#define G_IRC_PROTOCOL_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "irc"
+#define G_IRC_PROTOCOL_CLASSNAME "Epiphany's irc Protocol Handler"
+#define G_IRC_CONTENT_CONTRACTID NS_CONTENT_HANDLER_CONTRACTID_PREFIX \
+				 "application-x-gnome-irc"
+#define G_IRC_CONTENT_CLASSNAME "Epiphany's irc Content Handler"
+
+class GIRCProtocolHandler : public GBaseProtocolContentHandler
+{
+  public:
+	NS_DECL_ISUPPORTS
+	GIRCProtocolHandler() : GBaseProtocolContentHandler("irc")
+				   {NS_INIT_ISUPPORTS();};
+	virtual ~GIRCProtocolHandler() {};
+};
+
+#define G_FTP_PROTOCOL_CID                           \
+{ /* 5a48bdf4-a422-4eb4-b073-0fc3bee8e670 */         \
+    0x5a48bdf4,                                      \
+    0xa422,                                          \
+    0x4eb4,                                          \
+    {0xb0, 0x73, 0x0f, 0xc3, 0xbe, 0xe8, 0xe6, 0x70} \
+}
+#define G_FTP_PROTOCOL_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ftp"
+#define G_FTP_PROTOCOL_CLASSNAME "Epiphany's FTP Protocol Handler"
+#define G_FTP_CONTENT_CONTRACTID NS_CONTENT_HANDLER_CONTRACTID_PREFIX \
+				 "application-x-gnome-ftp"
+#define G_FTP_CONTENT_CLASSNAME "Epiphany's FTP Content Handler"
+
+#define NS_FTPPROTOCOLHANDLER_CID \
+{							\
+    0x25029490,						\
+    0xf132,						\
+    0x11d2,						\
+    {0x95, 0x88, 0x0, 0x80, 0x5f, 0x36, 0x9f, 0x95}	\
+}
+#define NS_FTPPROTOCOLHANDLER_CLASSNAME "The FTP Protocol Handler"
+
+class GFtpProtocolHandler : public GBaseProtocolContentHandler
+{
+  public:
+	NS_DECL_ISUPPORTS
+	GFtpProtocolHandler() : GBaseProtocolContentHandler("ftp")
+				{NS_INIT_ISUPPORTS();};
+	virtual ~GFtpProtocolHandler() {};
+	/* additional members */
+};
+
+#define G_MAILTO_PROTOCOL_CID                        \
+{ /* aabe33d3-7455-4d8f-87e7-43e4541ace4d */         \
+    0xaabe33d3,                                      \
+    0x7455,                                          \
+    0x4d8f,                                          \
+    {0x87, 0xe7, 0x43, 0xe4, 0x54, 0x1a, 0xce, 0x4d} \
+}
+#define G_MAILTO_PROTOCOL_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "mailto"
+#define G_MAILTO_PROTOCOL_CLASSNAME "Epiphany's mailto Protocol Handler"
+#define G_MAILTO_CONTENT_CONTRACTID NS_CONTENT_HANDLER_CONTRACTID_PREFIX \
+				 "application-x-gnome-mailto"
+#define G_MAILTO_CONTENT_CLASSNAME "Epiphany's mailto Content Handler"
+
+class GMailtoProtocolHandler : public GBaseProtocolContentHandler
+{
+  public:
+	NS_DECL_ISUPPORTS
+	GMailtoProtocolHandler() : GBaseProtocolContentHandler("mailto")
+				   {NS_INIT_ISUPPORTS();};
+	virtual ~GMailtoProtocolHandler() {};
+  private:
+};
+
+#define G_NEWS_PROTOCOL_CID                        \
+{ /* 3583f8f9-abc7-4ff0-84cb-0eefcaec99f8 */         \
+    0x3583f8f9,                                      \
+    0xabc7,                                          \
+    0x4ff0,                                          \
+    {0x84, 0xcb, 0x0e, 0xef, 0xca, 0xec, 0x99, 0xf8} \
+}
+#define G_NEWS_PROTOCOL_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "news"
+#define G_NEWS_PROTOCOL_CLASSNAME "Epiphany's news Protocol Handler"
+#define G_NEWS_CONTENT_CONTRACTID NS_CONTENT_HANDLER_CONTRACTID_PREFIX \
+				 "application-x-gnome-news"
+#define G_NEWS_CONTENT_CLASSNAME "Epiphany's news Content Handler"
+
+class GNewsProtocolHandler : public GBaseProtocolContentHandler
+{
+  public:
+	NS_DECL_ISUPPORTS
+	GNewsProtocolHandler() : GBaseProtocolContentHandler("news")
+				   {NS_INIT_ISUPPORTS();};
+	virtual ~GNewsProtocolHandler() {};
+  private:
+};
+
+#endif /* EXTERNAL_PROTOCOL_HANDLERS */
diff --git a/embed/mozilla/FtpProtocolHandler.cpp b/embed/mozilla/FtpProtocolHandler.cpp
deleted file mode 100644
index 267bf695b..000000000
--- a/embed/mozilla/FtpProtocolHandler.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2001 Philip Langdale
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include "FtpProtocolHandler.h"
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS2 (GFtpProtocolHandler, nsIProtocolHandler, nsIContentHandler)
-
diff --git a/embed/mozilla/FtpProtocolHandler.h b/embed/mozilla/FtpProtocolHandler.h
deleted file mode 100644
index d9b7c6c1b..000000000
--- a/embed/mozilla/FtpProtocolHandler.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Copyright (C) 2001 Philip Langdale
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __FtpProtocolHandler_h__
-#define __FtpProtocolHandler_h__
-    
-#include "nsError.h"
-#include "nsIProtocolHandler.h"
-#include "nsCURILoader.h"
-#include "BaseProtocolContentHandler.h"
-
-#define G_FTP_PROTOCOL_CID                           \
-{ /* 5a48bdf4-a422-4eb4-b073-0fc3bee8e670 */         \
-    0x5a48bdf4,                                      \
-    0xa422,                                          \
-    0x4eb4,                                          \
-    {0xb0, 0x73, 0x0f, 0xc3, 0xbe, 0xe8, 0xe6, 0x70} \
-}
-#define G_FTP_PROTOCOL_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ftp"
-#define G_FTP_PROTOCOL_CLASSNAME "Epiphany's FTP Protocol Handler"
-#define G_FTP_CONTENT_CONTRACTID NS_CONTENT_HANDLER_CONTRACTID_PREFIX \
-				 "application-x-gnome-ftp"
-#define G_FTP_CONTENT_CLASSNAME "Epiphany's FTP Content Handler"
-
-#define NS_FTPPROTOCOLHANDLER_CID \
-{							\
-    0x25029490,						\
-    0xf132,						\
-    0x11d2,						\
-    {0x95, 0x88, 0x0, 0x80, 0x5f, 0x36, 0x9f, 0x95}	\
-}
-#define NS_FTPPROTOCOLHANDLER_CLASSNAME "The FTP Protocol Handler"
-
-class GFtpProtocolHandler : public GBaseProtocolContentHandler
-{
-  public:
-	NS_DECL_ISUPPORTS
-	GFtpProtocolHandler() : GBaseProtocolContentHandler("ftp")
-				{NS_INIT_ISUPPORTS();};
-	virtual ~GFtpProtocolHandler() {};
-	/* additional members */
-};
-
-#endif // __FtpProtocolHandler_h__
diff --git a/embed/mozilla/IRCProtocolHandler.cpp b/embed/mozilla/IRCProtocolHandler.cpp
deleted file mode 100644
index 106ec98c1..000000000
--- a/embed/mozilla/IRCProtocolHandler.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *  Copyright (C) 2001 Philip Langdale
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include "IRCProtocolHandler.h"
-
-/* Implementation file */
-NS_IMPL_ISUPPORTS2 (GIRCProtocolHandler, nsIProtocolHandler, nsIContentHandler)
-
diff --git a/embed/mozilla/IRCProtocolHandler.h b/embed/mozilla/IRCProtocolHandler.h
deleted file mode 100644
index abe971380..000000000
--- a/embed/mozilla/IRCProtocolHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (C) 2001 Philip Langdale
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __IRCProtocolHandler_h__
-#define __IRCProtocolHandler_h__
-    
-#include "nsError.h"
-#include "BaseProtocolContentHandler.h"
-#include "nsIProtocolHandler.h"
-#include "nsCURILoader.h"
-
-#define G_IRC_PROTOCOL_CID			     \
-{ /* aabe33d3-7455-4d8f-87e7-43e4541ace4e */         \
-    0xaabe33d3,                                      \
-    0x7455,                                          \
-    0x4d8f,                                          \
-    {0x87, 0xe7, 0x43, 0xe4, 0x54, 0x1a, 0xce, 0x4e} \
-}
-#define G_IRC_PROTOCOL_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "irc"
-#define G_IRC_PROTOCOL_CLASSNAME "Epiphany's irc Protocol Handler"
-#define G_IRC_CONTENT_CONTRACTID NS_CONTENT_HANDLER_CONTRACTID_PREFIX \
-				 "application-x-gnome-irc"
-#define G_IRC_CONTENT_CLASSNAME "Epiphany's irc Content Handler"
-
-class GIRCProtocolHandler : public GBaseProtocolContentHandler
-{
-  public:
-	NS_DECL_ISUPPORTS
-	GIRCProtocolHandler() : GBaseProtocolContentHandler("irc")
-				   {NS_INIT_ISUPPORTS();};
-	virtual ~GIRCProtocolHandler() {};
-	/* additional members */
-};
-
-#endif // __IRCProtocolHandler_h__
diff --git a/embed/mozilla/MailtoProtocolHandler.h b/embed/mozilla/MailtoProtocolHandler.h
deleted file mode 100644
index 2d269c588..000000000
--- a/embed/mozilla/MailtoProtocolHandler.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Copyright (C) 2001 Philip Langdale
- *
- *  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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __MailtoProtocolHandler_h__
-#define __MailtoProtocolHandler_h__
-    
-#include "nsError.h"
-#include "nsIProtocolHandler.h"
-#include "nsCURILoader.h"
-#include "BaseProtocolContentHandler.h"
-
-#define G_MAILTO_PROTOCOL_CID                        \
-{ /* aabe33d3-7455-4d8f-87e7-43e4541ace4d */         \
-    0xaabe33d3,                                      \
-    0x7455,                                          \
-    0x4d8f,                                          \
-    {0x87, 0xe7, 0x43, 0xe4, 0x54, 0x1a, 0xce, 0x4d} \
-}
-#define G_MAILTO_PROTOCOL_CONTRACTID NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "mailto"
-#define G_MAILTO_PROTOCOL_CLASSNAME "Epiphany's mailto Protocol Handler"
-#define G_MAILTO_CONTENT_CONTRACTID NS_CONTENT_HANDLER_CONTRACTID_PREFIX \
-				 "application-x-gnome-mailto"
-#define G_MAILTO_CONTENT_CLASSNAME "Epiphany's mailto Content Handler"
-
-class GMailtoProtocolHandler : public GBaseProtocolContentHandler
-{
-  public:
-	NS_DECL_ISUPPORTS
-	GMailtoProtocolHandler() : GBaseProtocolContentHandler("mailto")
-				   {NS_INIT_ISUPPORTS();};
-	virtual ~GMailtoProtocolHandler() {};
-  private:
-};
-
-#endif // __MailtoProtocolHandler_h__
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index fc7e8fdd5..a2dfbf686 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -56,18 +56,14 @@ libephymozillaembed_la_SOURCES = 	\
 	EphyWrapper.h	                \
 	EventContext.cpp                \
 	EventContext.h                  \
+	ExternalProtocolHandlers.cpp	\
+	ExternalProtocolHandlers.h	\
 	ExternalProtocolService.cpp     \
 	ExternalProtocolService.h	\
 	FilePicker.cpp			\
 	FilePicker.h                    \
-	FtpProtocolHandler.cpp          \
-	FtpProtocolHandler.h            \
 	GlobalHistory.cpp               \
 	GlobalHistory.h                 \
-	IRCProtocolHandler.cpp          \
-	IRCProtocolHandler.h            \
-	MailtoProtocolHandler.cpp       \
-	MailtoProtocolHandler.h         \
 	MozillaPrivate.cpp		\
 	MozillaPrivate.h		\
 	MozRegisterComponents.cpp       \
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index 5a6c660c5..d6e79f697 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -22,10 +22,8 @@
 
 #include "ContentHandler.h"
 #include "FilePicker.h"
-#include "FtpProtocolHandler.h"
 #include "GlobalHistory.h"
-#include "IRCProtocolHandler.h"
-#include "MailtoProtocolHandler.h"
+#include "ExternalProtocolHandlers.h"
 #include "PrintingPromptService.h"
 #include "ProgressListener.h"
 #include "ExternalProtocolService.h"
@@ -46,6 +44,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(MozGlobalHistory)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GPrintingPromptService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GIRCProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GFtpProtocolHandler)
+NS_GENERIC_FACTORY_CONSTRUCTOR(GNewsProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GExternalProtocolService)
 
 static const nsModuleComponentInfo sAppComps[] = {
@@ -104,6 +103,18 @@ static const nsModuleComponentInfo sAppComps[] = {
 		GIRCProtocolHandlerConstructor
 	},
 	{
+		G_NEWS_PROTOCOL_CLASSNAME,
+		G_NEWS_PROTOCOL_CID,
+		G_NEWS_PROTOCOL_CONTRACTID,
+		GNewsProtocolHandlerConstructor
+	},
+	{
+		G_NEWS_CONTENT_CLASSNAME,
+		G_NEWS_PROTOCOL_CID,
+		G_NEWS_CONTENT_CONTRACTID,
+		GNewsProtocolHandlerConstructor
+	},
+	{
 		G_FTP_CONTENT_CLASSNAME,
 		G_FTP_PROTOCOL_CID,
 		G_FTP_CONTENT_CONTRACTID,