Revert the change from r7407; see bug #476540.

svn path=/trunk/; revision=7425

28 files changed, 28 insertions, 28 deletions

diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index c01300d2b..7f5160adc 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -34,7 +34,7 @@
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCExternalHandlerService.h>
 #include <nsComponentManagerUtils.h>
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index e3a19fee5..fc9c9af5b 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -24,7 +24,7 @@
 
 #include <unistd.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <gtkmozembed.h>
 #include <gtkmozembed_internal.h>
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index 7f8943687..52750d6ad 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -22,7 +22,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCOMPtr.h>
 #include <nsICategoryManager.h>
diff --git a/embed/mozilla/EphyDirectoryProvider.cpp b/embed/mozilla/EphyDirectoryProvider.cpp
index 7bb13ca65..a3b604434 100644
--- a/embed/mozilla/EphyDirectoryProvider.cpp
+++ b/embed/mozilla/EphyDirectoryProvider.cpp
@@ -28,7 +28,7 @@
 #define MOZILLA_INTERNAL_API 1
 #endif
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsAppDirectoryServiceDefs.h>
 #include <nsCOMPtr.h>
diff --git a/embed/mozilla/EphyFind.cpp b/embed/mozilla/EphyFind.cpp
index 8e96dfa69..4b217a4f5 100644
--- a/embed/mozilla/EphyFind.cpp
+++ b/embed/mozilla/EphyFind.cpp
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <gtkmozembed.h>
 #include <gtkmozembed_internal.h>
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 90a2f509d..2cd659afa 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -45,7 +45,7 @@
 #include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsComponentManagerUtils.h>
 #include <nsIChannel.h>
diff --git a/embed/mozilla/EphyHistoryListener.cpp b/embed/mozilla/EphyHistoryListener.cpp
index 5da2170e7..8576adae4 100644
--- a/embed/mozilla/EphyHistoryListener.cpp
+++ b/embed/mozilla/EphyHistoryListener.cpp
@@ -21,7 +21,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCOMPtr.h>
 #include <nsCURILoader.h>
diff --git a/embed/mozilla/EphyPromptService.cpp b/embed/mozilla/EphyPromptService.cpp
index 7aed419e9..7b848fe0c 100644
--- a/embed/mozilla/EphyPromptService.cpp
+++ b/embed/mozilla/EphyPromptService.cpp
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCOMPtr.h>
 #include <nsIDOMWindow.h>
diff --git a/embed/mozilla/EphySidebar.cpp b/embed/mozilla/EphySidebar.cpp
index f9a98c568..6c03773aa 100644
--- a/embed/mozilla/EphySidebar.cpp
+++ b/embed/mozilla/EphySidebar.cpp
@@ -22,7 +22,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsICategoryManager.h>
 #include <nsIScriptNameSpaceManager.h>
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 130086460..3d2f9c9eb 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -22,7 +22,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsICookie.h>
 #include <nsICookie2.h>
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index 60b9ac773..d4fbe20e6 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -21,7 +21,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <gtkmozembed.h>
 #include <nsCOMPtr.h>
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 6943775c3..7482d7dd6 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -25,7 +25,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsComponentManagerUtils.h>
 #include <nsIDOM3Node.h>
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index e452dd0a7..c33d474c9 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -28,7 +28,7 @@
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCOMPtr.h>
 #include <nsIDOMWindow.h>
diff --git a/embed/mozilla/GeckoCookiePromptService.cpp b/embed/mozilla/GeckoCookiePromptService.cpp
index 4fc7c21a6..5425d6ed7 100644
--- a/embed/mozilla/GeckoCookiePromptService.cpp
+++ b/embed/mozilla/GeckoCookiePromptService.cpp
@@ -30,7 +30,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkwindow.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include "ephy-debug.h"
 #include "ephy-gui.h"
diff --git a/embed/mozilla/GeckoFormSigningDialog.cpp b/embed/mozilla/GeckoFormSigningDialog.cpp
index 55b9d0d37..12fd2b221 100644
--- a/embed/mozilla/GeckoFormSigningDialog.cpp
+++ b/embed/mozilla/GeckoFormSigningDialog.cpp
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCOMPtr.h>
 #include <nsIDOMWindow.h>
diff --git a/embed/mozilla/GeckoPrintService.cpp b/embed/mozilla/GeckoPrintService.cpp
index c90e50191..330477ca0 100644
--- a/embed/mozilla/GeckoPrintService.cpp
+++ b/embed/mozilla/GeckoPrintService.cpp
@@ -32,7 +32,7 @@
 #include <gtk/gtkwindow.h>
 #include <glade/glade-xml.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCOMPtr.h>
 #include <nsIDOMWindow.h>
diff --git a/embed/mozilla/GeckoPrintSession.cpp b/embed/mozilla/GeckoPrintSession.cpp
index e0c3b89e9..5b755ec16 100644
--- a/embed/mozilla/GeckoPrintSession.cpp
+++ b/embed/mozilla/GeckoPrintSession.cpp
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsIDOMWindow.h>
 #include <nsIDOMWindowInternal.h>
diff --git a/embed/mozilla/GeckoSpellCheckEngine.cpp b/embed/mozilla/GeckoSpellCheckEngine.cpp
index 7b94e17b6..9df979c57 100644
--- a/embed/mozilla/GeckoSpellCheckEngine.cpp
+++ b/embed/mozilla/GeckoSpellCheckEngine.cpp
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <mozIPersonalDictionary.h>
 #include <nsMemory.h>
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 643a2a196..2a3154724 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -23,7 +23,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsIURI.h>
 
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 12b74573f..3dc585792 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -45,7 +45,7 @@
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkvbox.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsIDOMWindow.h>
 #include <nsIInterfaceRequestor.h>
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 789957960..a4bca8110 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -57,7 +57,7 @@
 #include <gconf/gconf-client.h>
 #include <glade/glade-xml.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCOMPtr.h>
 #include <nsIArray.h>
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index b27645969..38ed4162a 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -48,7 +48,7 @@
 
 #include <glib/gi18n.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsComponentManagerUtils.h>
 #include <nsICancelable.h>
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index 7cade19ca..fc9ad200d 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -25,7 +25,7 @@
 
 #include <glib/gmessages.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsComponentManagerUtils.h>
 #include <nsCOMPtr.h>
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 063093402..5b8d521f4 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -21,7 +21,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsILocalFile.h>
 #include <nsIMIMEInfo.h>
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 804028e8e..e6b3f64cf 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -23,7 +23,7 @@
 
 #include <stddef.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <nsCOMPtr.h>
 #include <nsComponentManagerUtils.h>
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 6866d4f46..4d81b54bb 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -31,7 +31,7 @@
 #include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <gtkmozembed.h>
 #include <gtkmozembed_internal.h>
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index b1da854ed..dac208769 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -22,7 +22,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include <gtkmozembed.h>
 #include <nsIDOMKeyEvent.h>
diff --git a/embed/mozilla/mozilla-x509-cert.cpp b/embed/mozilla/mozilla-x509-cert.cpp
index cb5d38fc2..2b9597fc9 100644
--- a/embed/mozilla/mozilla-x509-cert.cpp
+++ b/embed/mozilla/mozilla-x509-cert.cpp
@@ -22,7 +22,7 @@
 #include <xpcom-config.h>
 #include "config.h"
 
-#include <nsStringGlue.h>
+#include <nsStringAPI.h>
 
 #include "ephy-debug.h"