aboutsummaryrefslogtreecommitdiffstats
path: root/embed/xulrunner
diff options
context:
space:
mode:
Diffstat (limited to 'embed/xulrunner')
-rw-r--r--embed/xulrunner/embed/ContentHandler.cpp2
-rw-r--r--embed/xulrunner/embed/EphyBrowser.cpp2
-rw-r--r--embed/xulrunner/embed/EphyContentPolicy.cpp2
-rw-r--r--embed/xulrunner/embed/EphyFind.cpp2
-rw-r--r--embed/xulrunner/embed/EphyHeaderSniffer.cpp2
-rw-r--r--embed/xulrunner/embed/EphyHistoryListener.cpp2
-rw-r--r--embed/xulrunner/embed/EphyPromptService.cpp2
-rw-r--r--embed/xulrunner/embed/EphySidebar.cpp2
-rw-r--r--embed/xulrunner/embed/EphySingle.cpp2
-rw-r--r--embed/xulrunner/embed/EphyUtils.cpp2
-rw-r--r--embed/xulrunner/embed/EventContext.cpp2
-rw-r--r--embed/xulrunner/embed/FilePicker.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoCookiePromptService.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoFormSigningDialog.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoPrintService.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoPrintSession.cpp2
-rw-r--r--embed/xulrunner/embed/GeckoSpellCheckEngine.cpp2
-rw-r--r--embed/xulrunner/embed/GlobalHistory.cpp2
-rw-r--r--embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp2
-rw-r--r--embed/xulrunner/embed/GtkNSSDialogs.cpp2
-rw-r--r--embed/xulrunner/embed/MozDownload.cpp2
-rw-r--r--embed/xulrunner/embed/MozRegisterComponents.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-download.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-embed-persist.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-embed-single.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-embed.cpp2
-rw-r--r--embed/xulrunner/embed/mozilla-x509-cert.cpp2
-rw-r--r--embed/xulrunner/src/GeckoPromptService.cpp2
-rw-r--r--embed/xulrunner/tests/testgeckoembed.cpp2
29 files changed, 29 insertions, 29 deletions
diff --git a/embed/xulrunner/embed/ContentHandler.cpp b/embed/xulrunner/embed/ContentHandler.cpp
index cf5782e1f..051f5e077 100644
--- a/embed/xulrunner/embed/ContentHandler.cpp
+++ b/embed/xulrunner/embed/ContentHandler.cpp
@@ -34,7 +34,7 @@
#include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-utils.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCExternalHandlerService.h>
#include <nsComponentManagerUtils.h>
diff --git a/embed/xulrunner/embed/EphyBrowser.cpp b/embed/xulrunner/embed/EphyBrowser.cpp
index 4b95c49a7..e57dd58d8 100644
--- a/embed/xulrunner/embed/EphyBrowser.cpp
+++ b/embed/xulrunner/embed/EphyBrowser.cpp
@@ -24,7 +24,7 @@
#include <unistd.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsIChannel.h>
#include <nsICommandManager.h>
diff --git a/embed/xulrunner/embed/EphyContentPolicy.cpp b/embed/xulrunner/embed/EphyContentPolicy.cpp
index 52750d6ad..7f8943687 100644
--- a/embed/xulrunner/embed/EphyContentPolicy.cpp
+++ b/embed/xulrunner/embed/EphyContentPolicy.cpp
@@ -22,7 +22,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsICategoryManager.h>
diff --git a/embed/xulrunner/embed/EphyFind.cpp b/embed/xulrunner/embed/EphyFind.cpp
index c0c012c4b..8f5377362 100644
--- a/embed/xulrunner/embed/EphyFind.cpp
+++ b/embed/xulrunner/embed/EphyFind.cpp
@@ -23,7 +23,7 @@
#include <glib.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsComponentManagerUtils.h>
#include <nsCOMPtr.h>
diff --git a/embed/xulrunner/embed/EphyHeaderSniffer.cpp b/embed/xulrunner/embed/EphyHeaderSniffer.cpp
index ab140e69a..263ec2e36 100644
--- a/embed/xulrunner/embed/EphyHeaderSniffer.cpp
+++ b/embed/xulrunner/embed/EphyHeaderSniffer.cpp
@@ -45,7 +45,7 @@
#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs-utils.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsComponentManagerUtils.h>
#include <nsIChannel.h>
diff --git a/embed/xulrunner/embed/EphyHistoryListener.cpp b/embed/xulrunner/embed/EphyHistoryListener.cpp
index 8576adae4..5da2170e7 100644
--- a/embed/xulrunner/embed/EphyHistoryListener.cpp
+++ b/embed/xulrunner/embed/EphyHistoryListener.cpp
@@ -21,7 +21,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsCURILoader.h>
diff --git a/embed/xulrunner/embed/EphyPromptService.cpp b/embed/xulrunner/embed/EphyPromptService.cpp
index 7b848fe0c..7aed419e9 100644
--- a/embed/xulrunner/embed/EphyPromptService.cpp
+++ b/embed/xulrunner/embed/EphyPromptService.cpp
@@ -26,7 +26,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsIDOMWindow.h>
diff --git a/embed/xulrunner/embed/EphySidebar.cpp b/embed/xulrunner/embed/EphySidebar.cpp
index 4db2a00dc..1225e2d9a 100644
--- a/embed/xulrunner/embed/EphySidebar.cpp
+++ b/embed/xulrunner/embed/EphySidebar.cpp
@@ -22,7 +22,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsICategoryManager.h>
#include <nsIClassInfoImpl.h>
diff --git a/embed/xulrunner/embed/EphySingle.cpp b/embed/xulrunner/embed/EphySingle.cpp
index 12986f327..c6ac0be44 100644
--- a/embed/xulrunner/embed/EphySingle.cpp
+++ b/embed/xulrunner/embed/EphySingle.cpp
@@ -22,7 +22,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsICookie.h>
#include <nsICookie2.h>
diff --git a/embed/xulrunner/embed/EphyUtils.cpp b/embed/xulrunner/embed/EphyUtils.cpp
index c5bd79c50..af030d6f5 100644
--- a/embed/xulrunner/embed/EphyUtils.cpp
+++ b/embed/xulrunner/embed/EphyUtils.cpp
@@ -21,7 +21,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsDOMJSUtils.h> /* for GetScriptContextFromJSContext */
diff --git a/embed/xulrunner/embed/EventContext.cpp b/embed/xulrunner/embed/EventContext.cpp
index 7482d7dd6..6943775c3 100644
--- a/embed/xulrunner/embed/EventContext.cpp
+++ b/embed/xulrunner/embed/EventContext.cpp
@@ -25,7 +25,7 @@
#include <gdk/gdkkeysyms.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsComponentManagerUtils.h>
#include <nsIDOM3Node.h>
diff --git a/embed/xulrunner/embed/FilePicker.cpp b/embed/xulrunner/embed/FilePicker.cpp
index c33d474c9..e452dd0a7 100644
--- a/embed/xulrunner/embed/FilePicker.cpp
+++ b/embed/xulrunner/embed/FilePicker.cpp
@@ -28,7 +28,7 @@
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsIDOMWindow.h>
diff --git a/embed/xulrunner/embed/GeckoCookiePromptService.cpp b/embed/xulrunner/embed/GeckoCookiePromptService.cpp
index 5425d6ed7..4fc7c21a6 100644
--- a/embed/xulrunner/embed/GeckoCookiePromptService.cpp
+++ b/embed/xulrunner/embed/GeckoCookiePromptService.cpp
@@ -30,7 +30,7 @@
#include <gtk/gtkstock.h>
#include <gtk/gtkwindow.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include "ephy-debug.h"
#include "ephy-gui.h"
diff --git a/embed/xulrunner/embed/GeckoFormSigningDialog.cpp b/embed/xulrunner/embed/GeckoFormSigningDialog.cpp
index 12fd2b221..55b9d0d37 100644
--- a/embed/xulrunner/embed/GeckoFormSigningDialog.cpp
+++ b/embed/xulrunner/embed/GeckoFormSigningDialog.cpp
@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
#include <glade/glade-xml.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsIDOMWindow.h>
diff --git a/embed/xulrunner/embed/GeckoPrintService.cpp b/embed/xulrunner/embed/GeckoPrintService.cpp
index 6ca464590..b1d34a960 100644
--- a/embed/xulrunner/embed/GeckoPrintService.cpp
+++ b/embed/xulrunner/embed/GeckoPrintService.cpp
@@ -32,7 +32,7 @@
#include <gtk/gtkwindow.h>
#include <glade/glade-xml.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsIDOMWindow.h>
diff --git a/embed/xulrunner/embed/GeckoPrintSession.cpp b/embed/xulrunner/embed/GeckoPrintSession.cpp
index 5b755ec16..e0c3b89e9 100644
--- a/embed/xulrunner/embed/GeckoPrintSession.cpp
+++ b/embed/xulrunner/embed/GeckoPrintSession.cpp
@@ -26,7 +26,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsIDOMWindow.h>
#include <nsIDOMWindowInternal.h>
diff --git a/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp b/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp
index b5126a054..0b1257b41 100644
--- a/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp
+++ b/embed/xulrunner/embed/GeckoSpellCheckEngine.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <mozIPersonalDictionary.h>
#include <nsMemory.h>
diff --git a/embed/xulrunner/embed/GlobalHistory.cpp b/embed/xulrunner/embed/GlobalHistory.cpp
index c78335abc..a2fd79960 100644
--- a/embed/xulrunner/embed/GlobalHistory.cpp
+++ b/embed/xulrunner/embed/GlobalHistory.cpp
@@ -23,7 +23,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsIURI.h>
diff --git a/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp b/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp
index 3dc585792..12b74573f 100644
--- a/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp
+++ b/embed/xulrunner/embed/GtkNSSClientAuthDialogs.cpp
@@ -45,7 +45,7 @@
#include <gtk/gtktreemodel.h>
#include <gtk/gtkvbox.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsIDOMWindow.h>
#include <nsIInterfaceRequestor.h>
diff --git a/embed/xulrunner/embed/GtkNSSDialogs.cpp b/embed/xulrunner/embed/GtkNSSDialogs.cpp
index cea1ab460..51581f8db 100644
--- a/embed/xulrunner/embed/GtkNSSDialogs.cpp
+++ b/embed/xulrunner/embed/GtkNSSDialogs.cpp
@@ -57,7 +57,7 @@
#include <gconf/gconf-client.h>
#include <glade/glade-xml.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsIArray.h>
diff --git a/embed/xulrunner/embed/MozDownload.cpp b/embed/xulrunner/embed/MozDownload.cpp
index f4857e363..d6d28ec59 100644
--- a/embed/xulrunner/embed/MozDownload.cpp
+++ b/embed/xulrunner/embed/MozDownload.cpp
@@ -48,7 +48,7 @@
#include <glib/gi18n.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsComponentManagerUtils.h>
#include <nsICancelable.h>
diff --git a/embed/xulrunner/embed/MozRegisterComponents.cpp b/embed/xulrunner/embed/MozRegisterComponents.cpp
index 3d1120d27..69490d19d 100644
--- a/embed/xulrunner/embed/MozRegisterComponents.cpp
+++ b/embed/xulrunner/embed/MozRegisterComponents.cpp
@@ -25,7 +25,7 @@
#include <glib/gmessages.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsComponentManagerUtils.h>
#include <nsCOMPtr.h>
diff --git a/embed/xulrunner/embed/mozilla-download.cpp b/embed/xulrunner/embed/mozilla-download.cpp
index 5b8d521f4..063093402 100644
--- a/embed/xulrunner/embed/mozilla-download.cpp
+++ b/embed/xulrunner/embed/mozilla-download.cpp
@@ -21,7 +21,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsILocalFile.h>
#include <nsIMIMEInfo.h>
diff --git a/embed/xulrunner/embed/mozilla-embed-persist.cpp b/embed/xulrunner/embed/mozilla-embed-persist.cpp
index e6b3f64cf..804028e8e 100644
--- a/embed/xulrunner/embed/mozilla-embed-persist.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-persist.cpp
@@ -23,7 +23,7 @@
#include <stddef.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsComponentManagerUtils.h>
diff --git a/embed/xulrunner/embed/mozilla-embed-single.cpp b/embed/xulrunner/embed/mozilla-embed-single.cpp
index f7db9e0ad..cd0eabd99 100644
--- a/embed/xulrunner/embed/mozilla-embed-single.cpp
+++ b/embed/xulrunner/embed/mozilla-embed-single.cpp
@@ -31,7 +31,7 @@
#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs-utils.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsComponentManagerUtils.h>
#include <nsCOMPtr.h>
diff --git a/embed/xulrunner/embed/mozilla-embed.cpp b/embed/xulrunner/embed/mozilla-embed.cpp
index 4fefece2f..6a4aa7b48 100644
--- a/embed/xulrunner/embed/mozilla-embed.cpp
+++ b/embed/xulrunner/embed/mozilla-embed.cpp
@@ -22,7 +22,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsIDOMKeyEvent.h>
#include <nsIDOMMouseEvent.h>
diff --git a/embed/xulrunner/embed/mozilla-x509-cert.cpp b/embed/xulrunner/embed/mozilla-x509-cert.cpp
index 2b9597fc9..cb5d38fc2 100644
--- a/embed/xulrunner/embed/mozilla-x509-cert.cpp
+++ b/embed/xulrunner/embed/mozilla-x509-cert.cpp
@@ -22,7 +22,7 @@
#include <xpcom-config.h>
#include "config.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include "ephy-debug.h"
diff --git a/embed/xulrunner/src/GeckoPromptService.cpp b/embed/xulrunner/src/GeckoPromptService.cpp
index db4eece1d..a0fab3d95 100644
--- a/embed/xulrunner/src/GeckoPromptService.cpp
+++ b/embed/xulrunner/src/GeckoPromptService.cpp
@@ -26,7 +26,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#include <nsIDOMWindow.h>
diff --git a/embed/xulrunner/tests/testgeckoembed.cpp b/embed/xulrunner/tests/testgeckoembed.cpp
index decdf9b2d..eb96b623f 100644
--- a/embed/xulrunner/tests/testgeckoembed.cpp
+++ b/embed/xulrunner/tests/testgeckoembed.cpp
@@ -52,7 +52,7 @@
#include "nsIDOMMouseEvent.h"
#include "nsIDOMUIEvent.h"
-#include <nsStringAPI.h>
+#include <nsStringGlue.h>
#include <nsCOMPtr.h>
#define XPCOM_GLUE