galeon r8948 - in trunk: . mozilla

[philipl svn gnome org]

Author: philipl
Date: Sat Feb  2 23:45:33 2008
New Revision: 8948
URL: http://svn.gnome.org/viewvc/galeon?rev=8948&view=rev

Log:
2008-02-02  Philip Langdale  <philipl alumni utexas net>

	* configure.in
	* mozilla/MozRegisterComponents.cpp
	* mozilla/Makefile.am: Use the internal nsString test
	to skip MyPortal and custom about: handlers. Naturally,
	Gecko 1.9 makes it impossible to support these.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/mozilla/Makefile.am
   trunk/mozilla/MozRegisterComponents.cpp

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Feb  2 23:45:33 2008
@@ -344,6 +344,7 @@
 	[result=no])
 
 AC_MSG_RESULT([$result])
+AM_CONDITIONAL([HAVE_NSSTRING_INTERNAL], [test "$result" = "yes"])
 
 dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
 dnl https://bugzilla.mozilla.org/show_bug.cgi?id=240723

Modified: trunk/mozilla/Makefile.am
==============================================================================
--- trunk/mozilla/Makefile.am	(original)
+++ trunk/mozilla/Makefile.am	Sat Feb  2 23:45:33 2008
@@ -99,8 +99,6 @@
 	EphyPromptService.h		\
 	FilePicker.cpp			\
 	FilePicker.h                    \
-	GaleonAboutModule.cpp		\
-	GaleonAboutModule.h		\
 	GaleonWrapper.cpp               \
 	GaleonWrapper.h                 \
 	GaleonFind.cpp			\
@@ -126,8 +124,6 @@
 	MozillaPrivate.h		\
 	MozRegisterComponents.cpp       \
 	MozRegisterComponents.h         \
-	MyportalProtocolHandler.cpp	\
-	MyportalProtocolHandler.h	\
 	PrintingPromptService.cpp	\
 	PrintingPromptService.h		\
 	PrintProgressListener.cpp       \
@@ -139,6 +135,14 @@
 	SideBarProxy.cpp		\
 	SideBarProxy.h
 
+if HAVE_NSSTRING_INTERNAL
+libmozillaembed_la_SOURCES +=	\
+	GaleonAboutModule.cpp		\
+	GaleonAboutModule.h		\
+	MyportalProtocolHandler.cpp	\
+	MyportalProtocolHandler.h
+endif
+
 if HAVE_NSITOOLKITCHROMEREGISTRY_H
 libmozillaembed_la_SOURCES +=	\
 	EphyDirectoryProvider.cpp	\

Modified: trunk/mozilla/MozRegisterComponents.cpp
==============================================================================
--- trunk/mozilla/MozRegisterComponents.cpp	(original)
+++ trunk/mozilla/MozRegisterComponents.cpp	Sat Feb  2 23:45:33 2008
@@ -68,7 +68,6 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(GSidebarProxy)
 NS_DECL_CLASSINFO(GSidebarProxy)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GCookiePromptService)
-NS_GENERIC_FACTORY_CONSTRUCTOR(GaleonAboutModule)
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphyPromptService)
 #ifdef HAVE_MOZILLA_PSM
 NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSDialogs)
@@ -76,7 +75,10 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSClientAuthDialogs)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSSecurityWarningDialogs)
 #endif
+#ifdef HAVE_NSSTRING_INTERNAL
+NS_GENERIC_FACTORY_CONSTRUCTOR(GaleonAboutModule)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GMyportalProtocolHandler)
+#endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(GExternalProtocolService)
 #ifdef HAVE_NSIJSCONSOLESERVICE_H
 NS_GENERIC_FACTORY_CONSTRUCTOR(JSConsoleService)
@@ -205,6 +207,7 @@
                 GtkNSSSecurityWarningDialogsConstructor
         },
 #endif
+#ifdef HAVE_NSSTRING_INTERNAL
 	{
 		G_ABOUT_MYPORTAL_CLASSNAME,
 		G_MYPORTAL_PROTOCOL_CID,
@@ -229,6 +232,7 @@
 		GALEON_ABOUT_NETERROR_CONTRACTID,
 		GaleonAboutModuleConstructor
 	},
+#endif
 	{
 		EPHY_PROMPT_SERVICE_CLASSNAME,
 		EPHY_PROMPT_SERVICE_IID,