Bug 1332717 - include nsString.h instead of nsStringGlue.h (take 2). r+a=me DONTBUILD

mailnews/addrbook/src/nsAbOSXUtils.mm

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsAbOSXUtils.h"
-#include "nsStringGlue.h"
+#include "nsString.h"
 #include "nsAbOSXCard.h"
 #include "nsMemory.h"
 #include "mozilla/ArrayUtils.h"

mailnews/base/search/public/nsMsgSearchCore.idl

@@ -180,7 +180,7 @@ interface nsMsgSearchBooleanOp {
 [ptr] native nsMsgSearchValue(nsMsgSearchValue);
 
 %{C++
-#include "nsStringGlue.h"
+#include "nsString.h"
 
 typedef struct nsMsgSearchValue
 {

mailnews/compose/public/nsIMsgCompose.idl

@@ -9,7 +9,7 @@
 #include "nsIMsgSendListener.idl"
 
 %{C++
-#include "nsStringGlue.h"
+#include "nsString.h"
 %}
 
 interface nsIMsgSend;