From 0774d40cedbde3a4c8751d02e237f7b3b0e25572 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 4 Jul 2003 14:15:49 +0000 Subject: Remove use of acconfig.h. 2003-07-04 Marco Pesenti Gritti * configure.in: Remove use of acconfig.h. * embed/ephy-embed-shell.c: (ephy_embed_shell_get_embed_single): * embed/ephy-embed-single.c: * embed/ephy-embed-single.h: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/EphyWrapper.cpp: * embed/mozilla/Makefile.am: * embed/mozilla/MozRegisterComponents.cpp: * embed/mozilla/MozRegisterComponents.h: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed-single.h: * src/bookmarks/ephy-bookmarks-import.c: (bookmark_add), (xbel_parse_folder), (ephy_bookmarks_import_mozilla): * src/ephy-shell.c: (ephy_shell_init): Show an alert when mozilla cant start instead of crashing. Do not import bookmarks dups. Cleanup some mozilla code headers inclusion. --- embed/mozilla/MozRegisterComponents.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'embed/mozilla/MozRegisterComponents.cpp') diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp index 353deba88..5a6c660c5 100644 --- a/embed/mozilla/MozRegisterComponents.cpp +++ b/embed/mozilla/MozRegisterComponents.cpp @@ -173,13 +173,11 @@ static const nsModuleComponentInfo sModuleComps[] = { static NS_DEFINE_CID(knsFtpProtocolHandlerCID, NS_FTPPROTOCOLHANDLER_CID); -//Annoying globals to track the mozilla ftp handler so it can be restored. +/* Annoying globals to track the mozilla ftp handler so it can be restored. */ static PRBool ftpRegistered = PR_FALSE; static nsCOMPtr nsFtpFactory; -/* FIXME why we need to use "C" here ???? */ - -extern "C" gboolean +gboolean mozilla_register_components (void) { gboolean ret = TRUE; @@ -214,7 +212,8 @@ mozilla_register_components (void) /** * mozilla_register_FtpProtocolHandler: Register Ftp Protocol Handler */ -extern "C" gboolean mozilla_register_FtpProtocolHandler (void) +gboolean +mozilla_register_FtpProtocolHandler (void) { if (ftpRegistered == PR_TRUE) return TRUE; @@ -251,7 +250,8 @@ extern "C" gboolean mozilla_register_FtpProtocolHandler (void) /** * mozilla_unregister_FtpProtocolHandler: Unregister Ftp Protocol Handler */ -extern "C" gboolean mozilla_unregister_FtpProtocolHandler (void) +gboolean +mozilla_unregister_FtpProtocolHandler (void) { if (ftpRegistered == PR_FALSE) return FALSE; @@ -273,7 +273,7 @@ extern "C" gboolean mozilla_unregister_FtpProtocolHandler (void) /** * mozilla_register_MailtoProtocolHandler: Register Mailto Protocol Handler */ -extern "C" gboolean +gboolean mozilla_register_MailtoProtocolHandler (void) { gboolean retVal = TRUE; -- cgit v1.2.3