From 24b71aa8ac7de8dd140092705bb7cc439f6b3309 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Wed, 10 May 2006 18:07:03 +0000
Subject: Drop support for gecko 1.7.
2006-05-10 Christian Persch <chpe@cvs.gnome.org>
* configure.ac:
* data/glade/prefs-dialog.glade:
* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get):
* embed/mozilla/AutoJSContextStack.cpp:
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/ContentHandler.h:
* embed/mozilla/EphyAboutModule.cpp:
* embed/mozilla/EphyAboutModule.h:
* embed/mozilla/EphyBrowser.cpp:
* embed/mozilla/EphyBrowser.h:
* embed/mozilla/EphyContentPolicy.cpp:
* embed/mozilla/EphyContentPolicy.h:
* embed/mozilla/EphyDirectoryProvider.cpp:
* embed/mozilla/EphyFind.cpp:
* embed/mozilla/EphyFind.h:
* embed/mozilla/EphyHeaderSniffer.cpp:
* embed/mozilla/EphyHeaderSniffer.h:
* embed/mozilla/EphyHistoryListener.cpp:
* embed/mozilla/EphyHistoryListener.h:
* embed/mozilla/EphyPromptService.cpp:
* embed/mozilla/EphySidebar.cpp:
* embed/mozilla/EphySidebar.h:
* embed/mozilla/EphySingle.cpp:
* embed/mozilla/EphySingle.h:
* embed/mozilla/EphyUtils.cpp:
* embed/mozilla/EphyUtils.h:
* embed/mozilla/EventContext.cpp:
* embed/mozilla/EventContext.h:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/FilePicker.h:
* embed/mozilla/GlobalHistory.cpp:
* embed/mozilla/GlobalHistory.h:
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
* embed/mozilla/GtkNSSSecurityWarningDialogs.h:
* embed/mozilla/Makefile.am:
* embed/mozilla/MozDownload.cpp:
* embed/mozilla/MozDownload.h:
* embed/mozilla/MozRegisterComponents.cpp:
* embed/mozilla/MozRegisterComponents.h:
* embed/mozilla/MozillaPrivate.cpp:
* embed/mozilla/MozillaPrivate.h:
* embed/mozilla/PrintingPromptService.cpp:
* embed/mozilla/PrintingPromptService.h:
* embed/mozilla/mozilla-download.cpp:
* embed/mozilla/mozilla-download.h:
* embed/mozilla/mozilla-embed-event.cpp:
* embed/mozilla/mozilla-embed-event.h:
* embed/mozilla/mozilla-embed-find.cpp:
* embed/mozilla/mozilla-embed-find.h:
* embed/mozilla/mozilla-embed-persist.cpp:
* embed/mozilla/mozilla-embed-persist.h:
* embed/mozilla/mozilla-embed-single.cpp:
* embed/mozilla/mozilla-embed.cpp:
* embed/mozilla/mozilla-embed.h:
* embed/mozilla/mozilla-notifiers.cpp:
* embed/mozilla/mozilla-notifiers.h:
* embed/mozilla/mozilla-x509-cert.cpp:
* embed/mozilla/mozilla-x509-cert.h:
* lib/ephy-gui.c:
* lib/ephy-gui.h:
* lib/ephy-langs.c:
* m4/gecko.m4:
* src/ephy-window.c: (sync_tab_security):
* src/prefs-dialog.c: (prefs_dialog_init):
Drop support for gecko 1.7.
---
embed/mozilla/EphySingle.cpp | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
(limited to 'embed/mozilla/EphySingle.cpp')
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index 3a3948de0..e6e82a4f6 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -20,27 +20,28 @@
*/
#include "mozilla-config.h"
-
#include "config.h"
-#include "EphySingle.h"
-
-#include "ephy-debug.h"
+#include <nsStringAPI.h>
-#undef MOZILLA_INTERNAL_API
-#include <nsEmbedString.h>
-#define MOZILLA_INTERNAL_API 1
-#include <nsIURI.h>
-#include <nsIPermissionManager.h>
-#include <nsICookieManager.h>
-#include <nsIServiceManager.h>
+#include <nsICookie.h>
#include <nsICookie2.h>
-#include <nsIServiceManager.h>
+#include <nsICookieManager.h>
+#include <nsIObserverService.h>
+#include <nsIPermission.h>
+#include <nsIPermissionManager.h>
+#include <nsIURI.h>
+#include <nsServiceManagerUtils.h>
+#include <nsWeakReference.h>
#ifdef ALLOW_PRIVATE_API
#include <nsIIDNService.h>
#endif
+#include "ephy-debug.h"
+
+#include "EphySingle.h"
+
NS_IMPL_ISUPPORTS1(EphySingle, nsIObserver)
EphySingle::EphySingle()
@@ -183,7 +184,7 @@ NS_IMETHODIMP EphySingle::Observe(nsISupports *aSubject,
nsCOMPtr<nsIURI> uri = do_QueryInterface (aSubject);
if (uri)
{
- nsEmbedCString spec;
+ nsCString spec;
uri->GetSpec (spec);
g_signal_emit_by_name (EPHY_COOKIE_MANAGER (mOwner), "cookie-rejected", spec.get());
@@ -254,7 +255,7 @@ mozilla_cookie_to_ephy_cookie (nsICookie *cookie)
{
EphyCookie *info;
- nsEmbedCString transfer;
+ nsCString transfer;
cookie->GetHost (transfer);
@@ -262,7 +263,7 @@ mozilla_cookie_to_ephy_cookie (nsICookie *cookie)
(do_GetService ("@mozilla.org/network/idn-service;1"));
NS_ENSURE_TRUE (idnService, nsnull);
- nsEmbedCString decoded;
+ nsCString decoded;
/* ToUTF8 never fails, no need to check return value */
idnService->ConvertACEtoUTF8 (transfer, decoded);
@@ -305,7 +306,7 @@ EphyPermissionInfo *
mozilla_permission_to_ephy_permission (nsIPermission *perm)
{
nsresult rv;
- nsEmbedCString type;
+ nsCString type;
rv = perm->GetType(type);
NS_ENSURE_SUCCESS (rv, NULL);
@@ -326,14 +327,14 @@ mozilla_permission_to_ephy_permission (nsIPermission *perm)
break;
}
- nsEmbedCString host;
+ nsCString host;
perm->GetHost(host);
nsCOMPtr<nsIIDNService> idnService
(do_GetService ("@mozilla.org/network/idn-service;1"));
NS_ENSURE_TRUE (idnService, nsnull);
- nsEmbedCString decodedHost;
+ nsCString decodedHost;
idnService->ConvertACEtoUTF8 (host, decodedHost);
return ephy_permission_info_new (decodedHost.get(), type.get(), permission);
--
cgit