epiphany-extensions r1706 - in trunk: . extensions/livehttpheaders/mozilla extensions/page-info/mozilla

[chpe svn gnome org]

Author: chpe
Date: Thu Mar 27 14:27:55 2008
New Revision: 1706
URL: http://svn.gnome.org/viewvc/epiphany-extensions?rev=1706&view=rev

Log:
Don't use internal strings on xr 1.9.

Modified:
   trunk/configure.ac
   trunk/extensions/livehttpheaders/mozilla/LiveHTTPHeadersListener.cpp
   trunk/extensions/page-info/mozilla/PageInfoPrivate.cpp

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Mar 27 14:27:55 2008
@@ -331,7 +331,7 @@
 if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then
 	PKG_CHECK_MODULES([MOZILLA_COMPONENT],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
 else
-	MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS -UDEBUG"
+	MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS"
 	MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS `pkg-config --libs ${gecko_cv_gecko}`"
 fi
 

Modified: trunk/extensions/livehttpheaders/mozilla/LiveHTTPHeadersListener.cpp
==============================================================================
--- trunk/extensions/livehttpheaders/mozilla/LiveHTTPHeadersListener.cpp	(original)
+++ trunk/extensions/livehttpheaders/mozilla/LiveHTTPHeadersListener.cpp	Thu Mar 27 14:27:55 2008
@@ -26,9 +26,14 @@
 #include "LiveHTTPHeadersListener.h"
 #include "mozilla-helper.h"
 
+#ifdef HAVE_GECKO_1_9
+#include <nsStringGlue.h>
+#else
 #undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
 #define MOZILLA_INTERNAL_API 1
+#endif /* HAVE_GECKO_1_9 */
+
 #include <nsIHttpChannel.h>
 #include <nsIHttpHeaderVisitor.h>
 #include <nsIHttpProtocolHandler.h>
@@ -43,7 +48,7 @@
 	HeaderVisitor();
 	~HeaderVisitor();
 
-	nsEmbedCString mHeader;	
+	nsCString mHeader;
 };
 
 NS_IMPL_ISUPPORTS1(HeaderVisitor, nsIHttpHeaderVisitor)
@@ -87,7 +92,7 @@
 	nsCOMPtr<nsIHttpChannel> protocol = do_QueryInterface (aSubject);
 	NS_ENSURE_TRUE (protocol, NS_ERROR_FAILURE);
 
-	nsEmbedCString name;
+	nsCString name;
 	protocol->GetName (name);
 
 	if (strcmp (aTopic, NS_HTTP_ON_MODIFY_REQUEST_TOPIC) == 0)

Modified: trunk/extensions/page-info/mozilla/PageInfoPrivate.cpp
==============================================================================
--- trunk/extensions/page-info/mozilla/PageInfoPrivate.cpp	(original)
+++ trunk/extensions/page-info/mozilla/PageInfoPrivate.cpp	Thu Mar 27 14:27:55 2008
@@ -23,8 +23,12 @@
 
 #include <nscore.h>
 
+#ifdef HAVE_GECKO_1_9
+#include <nsStringGlue.h>
+#else
 #define MOZILLA_INTERNAL_API 1
 #include <nsString.h>
+#endif /* HAVE_GECKO_1_9 */
 
 #include <nsCOMPtr.h>
 #include <nsIDOMDocument.h>