galeon r8967 - in trunk: . mozilla
- From: philipl svn gnome org
- To: svn-commits-list gnome org
- Subject: galeon r8967 - in trunk: . mozilla
- Date: Fri, 4 Jul 2008 20:13:59 +0000 (UTC)
Author: philipl
Date: Fri Jul 4 20:13:58 2008
New Revision: 8967
URL: http://svn.gnome.org/viewvc/galeon?rev=8967&view=rev
Log:
2008-07-04 Philip Langdale <philipl alumni utexas net>
* configure.in
* mozilla/EphyDirectoryProvider.cpp
* mozilla/GaleonFind.cpp
* mozilla/GaleonWrapper.cpp
* mozilla/ContentHandler.cpp
* mozilla/ProgressListener.h
* mozilla/MozRegisterComponents.cpp
* mozilla/GaleonJS.cpp
* mozilla/mozilla-notifiers.cpp
* mozilla/GaleonFind.h
* mozilla/EventContext.cpp
* mozilla/ExternalProtocolService.h
* mozilla/GtkNSSKeyPairDialogs.cpp
* mozilla/HeaderSniffer.cpp
* mozilla/FilePicker.cpp
* mozilla/GlobalHistory.cpp
* mozilla/ExternalProtocolService.cpp
* mozilla/mozilla-embed-shell.cpp
* mozilla/EphyPromptService.cpp
* mozilla/MozillaPrivate.cpp
* mozilla/JSConsoleListener.cpp
* mozilla/ProgressListener.cpp
* mozilla/MyportalProtocolHandler.cpp
* mozilla/GlobalHistory.h: Remove support for old non-toolkit
based mozillas and toolkit < 1.8. Essentially this means
support is now for firefox 2.0, xulrunner 1.8, firefox 3.0
and xulrunner 1.9. Trunk seamonkey-on-toolkit builds might
work as might thunderbird 2.0, but I haven't tried these.
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/mozilla/ContentHandler.cpp
trunk/mozilla/EphyDirectoryProvider.cpp
trunk/mozilla/EphyPromptService.cpp
trunk/mozilla/EventContext.cpp
trunk/mozilla/ExternalProtocolService.cpp
trunk/mozilla/ExternalProtocolService.h
trunk/mozilla/FilePicker.cpp
trunk/mozilla/GaleonFind.cpp
trunk/mozilla/GaleonFind.h
trunk/mozilla/GaleonJS.cpp
trunk/mozilla/GaleonWrapper.cpp
trunk/mozilla/GlobalHistory.cpp
trunk/mozilla/GlobalHistory.h
trunk/mozilla/GtkNSSKeyPairDialogs.cpp
trunk/mozilla/HeaderSniffer.cpp
trunk/mozilla/JSConsoleListener.cpp
trunk/mozilla/MozRegisterComponents.cpp
trunk/mozilla/MozillaPrivate.cpp
trunk/mozilla/MyportalProtocolHandler.cpp
trunk/mozilla/ProgressListener.cpp
trunk/mozilla/ProgressListener.h
trunk/mozilla/mozilla-embed-shell.cpp
trunk/mozilla/mozilla-notifiers.cpp
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Fri Jul 4 20:13:58 2008
@@ -212,10 +212,10 @@
AC_MSG_CHECKING([which mozilla engine to use])
AC_ARG_WITH([mozilla],
- AC_HELP_STRING([--with-mozilla@<:@=libxul-embedding-unstable|mozilla|seamonkey|firefox|xulrunner|thunderbird@:>@],
+ AC_HELP_STRING([--with-mozilla@<:@=libxul-embedding-unstable|seamonkey|firefox|xulrunner|thunderbird@:>@],
[Which gecko engine to use (default: autodetect)]))
-GECKOS="libxul-embedding-unstable firefox mozilla-firefox seamonkey mozilla xulrunner thunderbird mozilla-thunderbird"
+GECKOS="libxul-embedding-unstable firefox mozilla-firefox seamonkey xulrunner thunderbird mozilla-thunderbird"
gecko=$with_mozilla
autodetect=
@@ -240,10 +240,9 @@
case "$gecko" in
libxul-embedding-unstable) min_version=1.9 flavour=toolkit ;;
-mozilla) min_version=1.7.5 flavour=mozilla ;;
-seamonkey) min_version=1.0 flavour=mozilla ;;
-*firefox) min_version=1.0 flavour=toolkit ;;
-*thunderbird) min_version=1.0 flavour=toolkit ;;
+seamonkey) min_version=2.0 flavour=toolkit ;;
+*firefox) min_version=2.0 flavour=toolkit ;;
+*thunderbird) min_version=2.0 flavour=toolkit ;;
*xulrunner) min_version=1.8 flavour=toolkit ;;
esac
@@ -405,23 +404,6 @@
AC_MSG_RESULT([$result])
AM_CONDITIONAL([HAVE_NSSTRING_INTERNAL], [test "$result" = "yes"])
-dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=240723
-AC_MSG_CHECKING([whether nsIFilePicker methods expect nsAString&])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIFilePicker.h>]],
- [[nsIFilePicker *p;
- p->SetDefaultString (nsEmbedString());]]
- )],
- [AC_DEFINE([HAVE_NSIFILEPICKER_NSASTRING],[1],
- [Define if nsIFilePicker uses nsAString&]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
dnl Changed from nsIFileURL to nsIURI
AC_MSG_CHECKING([whether nsIFilePicker::GetFileURL expect nsIURI])
@@ -439,41 +421,6 @@
AC_MSG_RESULT([$result])
-dnl Changed from char* to nsAString& in 1.8a1
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=235502
-AC_MSG_CHECKING([whether nsIMIMEInfo methods expect nsAString&])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIMIMEInfo.h>]],
- [[nsIMIMEInfo *p;
- nsEmbedCString s;
- p->GetMIMEType (s);]]
- )],
- [AC_DEFINE([HAVE_NSIMIMEINFO_NSASTRING],[1],
- [Define if nsIMIMEInfo uses nsAString&]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl ApplicationDescription renamed to Description
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=384374
-AC_MSG_CHECKING([for nsIMIMEInfo::SetDescription])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIMIMEInfo.h>]],
- [[nsIMIMEInfo *p;
- p->SetDescription (nsEmbedString());]]
- )],
- [AC_DEFINE([HAVE_NSIMIMEINFO_SETDESCRIPTION],[1],
- [Define if nsIMIMEInfo::SetDescription exists]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
dnl nsMIMEInfoHandleAction renamed to nsHandlerInfoAction
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=384374
AC_MSG_CHECKING([for nsHandlerInfoAction])
@@ -489,49 +436,6 @@
AC_MSG_RESULT([$result])
-dnl Changed from char* to nsACString& in 1.8a6
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=277627
-AC_MSG_CHECKING([whether nsICacheSession methods expect nsACString&])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsICacheSession.h>]],
- [[nsICacheSession *s;
- s->OpenCacheEntry (nsEmbedCString(), 0, 0, NULL);]]
- )],
- [AC_DEFINE([HAVE_NSICACHESESSION_NSACSTRING],[1],
- [Define if nsICacheSession uses nsACString&]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl changed in 1.8a4
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=128398
-AC_MSG_CHECKING([whether nsIGlobalHistory2::AddURI takes a referrer])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsIURI.h>
- #include <nsIGlobalHistory2.h>]],
- [[nsIGlobalHistory2 *p;
- p->AddURI(nsnull,PR_FALSE,PR_FALSE,nsnull);]]
- )],
- [AC_DEFINE([HAVE_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER],[1],
- [Define if nsIGlobalHistory2::AddURI takes the referrer argument]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl changed in 1.9a1
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=328928
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIGlobalHistory3.h],
- [AC_DEFINE([HAVE_NSIGLOBALHISTORY3_H], [1],
- [Define if nsIGlobalHistory3.h exists])])
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/docshell/nsIGlobalHistory3.h],
- [AC_DEFINE([HAVE_NSIGLOBALHISTORY3_H], [1],
- [Define if nsIGlobalHistory3.h exists])])
-
dnl changed in 1.9a1
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=293714
AC_MSG_CHECKING([whether nsIGlobalHistory3::SetURIGeckoFlags exists])
@@ -548,27 +452,6 @@
AC_MSG_RESULT([$result])
-dnl changed in 1.8a2
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=245619
-AC_MSG_CHECKING([whether nsIScriptContext takes an nsAString*])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#undef MOZILLA_STRICT_API
- #define MOZILLA_INTERNAL_API
- #include <nsString.h>
- #include <nsIScriptContext.h>]],
- [[nsIScriptContext *p;
- nsAutoString arg;
- p->EvaluateString(nsAutoString(), nsnull, nsnull, nsnull, 0,
- nsnull, &arg, nsnull);]]
- )],
- [AC_DEFINE([HAVE_NSISCRIPTCONTEXT_NSASTRING_P],[1],
- [Define if nsIScriptContext::EvaluateString takes a nsAString pointer]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
dnl changed in 1.9a1
AC_MSG_CHECKING([whether nsIScriptContext is MOZILLA_INTERNAL_API])
AC_COMPILE_IFELSE(
@@ -585,75 +468,6 @@
[result=no])
AC_MSG_RESULT([$result])
-dnl nsIPresShell::GetDocument() was deCOMtaminated in 1.8a3
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=253889
-AC_MSG_CHECKING([for nsIPresShell deCOMtamination])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#define MOZILLA_INTERNAL_API
- #include <nsIPresShell.h>]],
- [[nsIPresShell *p;
- p->GetDocument();]]
- )],
- [AC_DEFINE([HAVE_NSIPRESSHELL_DECOMTAMINATE],[1],
- [Define if nsIPresShell::GetDocument() returns the document]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl check for broken contextmenu event
-dnl
-dnl This is fixed since 1.8a4, but lets not worry about it for 1.8a3
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=258193
-AC_MSG_CHECKING([for broken context menu event])
-
-AC_PREPROC_IFELSE(
- [AC_LANG_SOURCE(
- [[#include <mozilla-config.h>
- #define _DECL_VERSION(major,minor) ((major << 8) + minor)
- #if (_DECL_VERSION(MOZILLA_VERSION_MAJOR,MOZILLA_VERSION_MINOR) < _DECL_VERSION(1,8))
- #error Yes
- #endif]]
- )],
- [AC_DEFINE([HAVE_BROKEN_CTX_MENU_EVENT],[1],
- [Define if mozilla has a broken context menu event]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl check for new image permission pref name
-dnl
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=279782
-AC_MSG_CHECKING([for new image permission pref name])
-
-AC_PREPROC_IFELSE(
- [AC_LANG_SOURCE(
- [[#include <mozilla-config.h>
- #define _DECL_VERSION(major,minor) ((major << 8) + minor)
- #if (_DECL_VERSION(MOZILLA_VERSION_MAJOR,MOZILLA_VERSION_MINOR) >= _DECL_VERSION(1,8))
- #error Yes
- #endif]]
- )],
- [AC_DEFINE([HAVE_NEW_IMAGE_PERMISSION_NAME],[1],
- [Define if mozilla has the new image permission name]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl nsExternalProtocolService::GetApplicationDescription was added in 1.8a5
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=258802
-AC_MSG_CHECKING([whether nsExternalProtocolService::GetApplicationDescription exists])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIExternalProtocolService.h>]],
- [[nsIExternalProtocolService *p;
- nsEmbedString str;
- p->GetApplicationDescription(nsEmbedCString(), str);]]
- )],
- [AC_DEFINE([HAVE_NSIEXTERNALPROTOCOLSERVICE_GETAPPDESC],[1],
- [Define if nsExternalProtocolService::GetApplicationDescription exists]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl nsExternalProtocolService::LoadURI was added in 1.8a5
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=263546
AC_MSG_CHECKING([whether nsExternalProtocolService::LoadURI exists])
@@ -706,24 +520,6 @@
AC_MSG_RESULT([$result])
-dnl nsPIExternalProtocolService was added in 1.7.5, but never
-dnl got into trunk (see the check above)
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=263546
-AC_MSG_CHECKING([whether nsPIExternalProtocolService exists])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIPrompt.h>
- #include <nsIExternalProtocolService.h>]],
- [[nsPIExternalProtocolService *p;
- nsIPrompt *prompt; nsIURI *uri;
- p->LoadURI(uri, prompt);]]
- )],
- [AC_DEFINE([HAVE_NSPIEXTERNALPROTOCOLSERVICE],[1],
- [Define if nsPIExternalProtocolService exists]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl nsIJSConsoleService was removed as useless.
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=243170
AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/jsconsole/nsIJSConsoleService.h],
@@ -732,23 +528,6 @@
[result=no])
AM_CONDITIONAL([HAVE_NSIJSCONSOLESERVICE_H], [test "$result" = "yes"])
-dnl added after 1.7.3, on aviary and in 1.8a5 on trunk
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=257431
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=262887
-AC_MSG_CHECKING([for nsIDOMNSEvent::GetIsTrusted])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsIDOMNSEvent.h>]],
- [[nsIDOMNSEvent *p;
- p->GetIsTrusted (nsnull);]]
- )],
- [AC_DEFINE([HAVE_NSIDOMNSEVENT_GETISTRUSTED],[1],
- [Define if nsIDOMNSEvent::GetIsTrusted exists]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
dnl Changed event to return window instead of just uri.
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=354973
AC_MSG_CHECKING([for nsIDOMPopupBlockedEvent::GetRequestingWindow])
@@ -765,82 +544,6 @@
AC_MSG_RESULT([$result])
-dnl Changed in 1.8a1 and again in 1.8a3 to its present form (variant 2);
-dnl variant 1 is on 1.7 branch. Aviary branch also has variant 2.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=191839
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=252027
-AC_MSG_CHECKING([for new nsIContentPolicy API])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIContentPolicy.h>]],
- [[nsIContentPolicy *p;
- p->ShouldLoad(0,nsnull,nsnull,nsnull,nsEmbedCString(),nsnull,nsnull);]]
- )],
- [AC_DEFINE([HAVE_NEW_NSICONTENTPOLICY_API], [1],
- [Define if the nsIContentPolicy API is the new style]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl Added in 1.8a6 on trunk
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=223310
-AC_MSG_CHECKING([whether nsIKeygenThread takes an nsIObserver])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsIKeygenThread.h>
- #include <nsIObserver.h>]],
- [[nsIKeygenThread *p;
- nsIObserver *obs;
- p->StartKeyGeneration (obs);]]
- )],
- [AC_DEFINE([HAVE_NSIKEYGENTHREAD_NSIOBSERVER],[1],
- [Define if nsIKeygenThread::StartKeyGeneration takes an nsIObserver]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl changed from nsIXULChromeRegistry in 1.8a4
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=246014
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/chrome/nsIChromeRegistrySea.h],
- [AC_DEFINE([HAVE_NSICHROMEREGISTRYSEA_H], [1],
- [Define if nsIChromeRegistrySea.h exists])])
-
-dnl firefox/thunderbird don't use the chrome registry to set the locale/skin
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=246014
-AC_MSG_CHECKING([for nsIXULChromeRegistry::SelectLocale])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsIChromeRegistry.h>
- #include <nsEmbedString.h>]],
- [[nsIXULChromeRegistry *r;
- r->SelectLocale(nsEmbedCString(), PR_FALSE);]]
- )],
- [AC_DEFINE([HAVE_NSIXULCHROMEREGISTRY_SELECTLOCALE], [1],
- [Define if nsIXULChromeRegistry can't set locale]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl nsIHelperAppLauncherDialog changed to pass an enum instead of a bool.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=285517
-AC_MSG_CHECKING([whether nsIHelperAppLauncherDialog::Show takes Reason])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsIHelperAppLauncherDialog.h>
- class Test : public nsIHelperAppLauncherDialog
- { public: NS_DECL_NSIHELPERAPPLAUNCHERDIALOG };
- NS_IMETHODIMP Test::Show(nsIHelperAppLauncher *aLauncher,
- nsISupports *aContext,
- PRUint32 aReason)
- { return NS_ERROR_NOT_IMPLEMENTED; }]]
- )],
- [AC_DEFINE([HAVE_NSIHELPERAPPLAUNCHERDIALOG_SHOW_REASON], [1],
- [Define if nsIHelperAppLauncherDialog::Show takes Reason]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl nsIHelperAppLauncherDialog::PromptForSaveToFile takes aForcePrompt
AC_MSG_CHECKING([whether nsIHelperAppLauncherDialog::PromptForSaveToFile takes aForcePrompt])
AC_COMPILE_IFELSE(
@@ -855,55 +558,6 @@
AC_MSG_RESULT([$result])
-dnl nsIDocShell::GetSecurityUI was added in 1.8b2 as part of the fastback
-dnl patch
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=274784
-AC_MSG_CHECKING([whether nsIDocShell::GetSecureUI exists])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsIDocShell.h>]],
- [[ nsIDocShell *p;
- p->GetSecurityUI( nsnull ); ]]
- )],
- [AC_DEFINE([HAVE_NSIDOCSHELL_GETSECUREUI], [1],
- [Define if nsIDocShell::GetSecureUI exists]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl firefox extended the nsIDownload interface with a couple of new calls.
-dnl In due course we will only need to implement nsITransfer and avoid is completely.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=239006
-AC_MSG_CHECKING([for nsIDownload::GetSize])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsIDownload.h>]],
- [[nsIDownload *d;
- d->GetSize(nsnull);]]
- )],
- [AC_DEFINE([HAVE_NSIDOWNLOAD_GETSIZE], [1],
- [Define if nsIDownload includes GetSize]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl As promised, 241082 landed and builds after that only require nsITransfer
-dnl and not nsIDownload.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=241082
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsITransfer.h],
- [AC_DEFINE([HAVE_NSITRANSFER_H], [1],
- [Define if nsITransfer.h exists])])
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsITransfer.h],
- [AC_DEFINE([HAVE_NSITRANSFER_H], [1],
- [Define if nsITransfer.h exists])])
-
-dnl nsIWebProgressListener2 has been added for 64bit progress messages.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=228968
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIWebProgressListener2.h],
- [AC_DEFINE([HAVE_NSIWEBPROGRESSLISTENER2_H], [1],
- [Define if nsIWebProgressListener2.h exists])])
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsIWebProgressListener2.h],
- [AC_DEFINE([HAVE_NSIWEBPROGRESSLISTENER2_H], [1],
- [Define if nsIWebProgressListener2.h exists])])
-
dnl nsIWebProgressListener2 added onRefreshAttempted
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=83265
AC_MSG_CHECKING([for nsIWebProgressListener2::OnRefreshAttempted])
@@ -918,70 +572,6 @@
[result=no])
AC_MSG_RESULT([$result])
-dnl nsICancelable was added in 1.8b2 to unify Cancelable interfaces
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=287648
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsICancelable.h],
- [AC_DEFINE([HAVE_NSICANCELABLE_H],[1],
- [Define if nsICancelable.h exists])])
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/necko/nsICancelable.h],
- [AC_DEFINE([HAVE_NSICANCELABLE_H],[1],
- [Define if nsICancelable.h exists])])
-
-dnl In 1.8b2, the nsIWebBrowserPersist parameter to nsITransfer was
-dnl replaced with nsICancelable (which nsIWebBrowserPersist now
-dnl inherits from) as |Cancel| is the only method that's needed.
-dnl This provides a unified mechanism to cancel a transfer. Previously,
-dnl an Observer had to be notified if no persist was passed.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=290648
-AC_MSG_CHECKING([whether nsITransfer::Init takes nsICancelable only])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsITransfer.h>
- #include <nsEmbedString.h>]],
- [[nsITransfer *t;
- nsICancelable *c;
- t->Init(nsnull, nsnull, nsEmbedString(), nsnull, 0, c);]]
- )],
- [AC_DEFINE([HAVE_NSITRANSFER_NSICANCELABLE], [1],
- [Define if nsITransfer::Init takes nsICancelable]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl In 1.8b6?, nsITransfer::Init was extended to take the
-dnl temp file being used for the partial download.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=298842
-AC_MSG_CHECKING([whether nsITransfer::Init takes nsICancelable and a temp file])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsITransfer.h>
- #include <nsEmbedString.h>]],
- [[nsITransfer *t;
- t->Init(nsnull, nsnull, nsEmbedString(), nsnull, 0, nsnull, nsnull);]]
- )],
- [AC_DEFINE([HAVE_NSITRANSFER_TEMPFILE], [1],
- [Define if nsITransfer::Init takes a temp file])
- AC_DEFINE([HAVE_NSITRANSFER_NSICANCELABLE], [1],
- [Define if nsITransfer::Init takes nsICancelable]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl In mozilla 1.8a5, checkloaduri can be fine-tuned with capabilities,
-dnl we use this to allow file: urls from the myportal: handler, the change
-dnl required an API change to the nsIScriptSecurityManager, so that is
-dnl what we test for
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=233108
-AC_MSG_CHECKING([for checkLoadURI capability code])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsIScriptSecurityManager.h>]],
- [[nsIScriptSecurityManager *s;
- s->CheckLoadURIWithPrincipal(nsnull, nsnull, nsnull);]]
- )],
- [AC_DEFINE([HAVE_CHECKLOADURI_CAPABILITIES], [1],
- [Define if mozilla has capabilites for checkloaduri]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl Check that the mozilla security stuff is installed
dnl Not a simple file check due to the header being in the SDK now
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=271068
@@ -997,22 +587,6 @@
[result=no])
AC_MSG_RESULT([$result])
-dnl During 1.8b3, nsIScriptError was nsStringified.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=286450
-AC_MSG_CHECKING([for nsIScriptError uses nsAString])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIScriptError.h>]],
- [[nsIScriptError *e;
- nsEmbedString str;
- e->GetSourceName(str);]]
- )],
- [AC_DEFINE([HAVE_SCRIPTERROR_NSASTRING], [1],
- [Define if nsIScriptError uses nsAString]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl nsIBadCertListener2 was added in gecko 1.9 to replace nsIBadCertListener
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=3271
AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIBadCertListener.h],
@@ -1022,21 +596,6 @@
[AC_DEFINE([HAVE_NSIBADCERTLISTENER_H],[1],
[Define if nsIBadCertListener.h exists])])
-dnl During 1.8b3, nsIDocument::GetCSSLoader was renamed.
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=290068
-AC_MSG_CHECKING([for nsIDocument::CSSLoader])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#define MOZILLA_INTERNAL_API
- #include <nsIDocument.h>]],
- [[nsIDocument *d;
- d->CSSLoader();]]
- )],
- [AC_DEFINE([HAVE_NSIDOCUMENT_CSSLOADER], [1],
- [Define if nsIDocument includes CSSLoader]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl During 1.9a1, GetCompatibilityMode was moved to nsIDocument
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=362797
AC_MSG_CHECKING([for nsIDocument::GetCompatibilityMode])
@@ -1051,31 +610,6 @@
[result=no])
AC_MSG_RESULT([$result])
-AC_MSG_CHECKING([for toolkit's nsITypeAheadFind])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsITypeAheadFind.h>]],
- [[nsITypeAheadFind *p;
- p->SetDocShell(nsnull);]]
- )],
- [AC_DEFINE([HAVE_TYPEAHEADFIND],[1],[Define if we have toolkit's typeaheadfind]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
-dnl Added in trunk at some point
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=259454
-AC_MSG_CHECKING([for nsITypeAheadFind::GetFoundLink])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsITypeAheadFind.h>]],
- [[nsITypeAheadFind *p;
- p->GetFoundLink(nsnull);]]
- )],
- [AC_DEFINE([HAVE_NSITYPEAHEADFIND_GETFOUNDLINK],[1],[Define nsITypeAheadFind has a GetFoundLink function]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl Allow typeaheadfind to know about focus
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=189039
AC_MSG_CHECKING([for nsITypeAheadFind::SetSelectionModeAndRepaint])
@@ -1102,33 +636,6 @@
[result=no])
AC_MSG_RESULT([$result])
-dnl typeaheadfind changed to pass aLinksOnly to FindAgain
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=343077
-AC_MSG_CHECKING([for nsITypeAheadFind::FindAgain with aLinksOnly])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsITypeAheadFind.h>]],
- [[nsITypeAheadFind *p;
- p->FindAgain(0, 0, 0, 0);]]
- )],
- [AC_DEFINE([HAVE_NSITYPEAHEADFIND_FINDAGAIN_ALINKSONLY],[1],[Define nsITypeAheadFind has a FindAgain function with aLinksonly]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
-dnl typeaheadfind changed to remove aHasFocus
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=360437
-AC_MSG_CHECKING([for nsITypeAheadFind::Find without aHasFocus])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsITypeAheadFind.h>]],
- [[nsITypeAheadFind *p;
- p->Find(nsEmbedString(), 0, 0);]]
- )],
- [AC_DEFINE([HAVE_NSITYPEAHEADFIND_FINDNOFOCUS],[1],[Define nsITypeAheadFind has a Find function without aHasFocus]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl During 1.9a1, nsICSSLoader methods were changed
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=293825
AC_MSG_CHECKING([for nsICSSLoader::LoadSheetSync])
@@ -1165,20 +672,6 @@
[result=no])
AM_CONDITIONAL([HAVE_NSITOOLKITCHROMEREGISTRY_H], [test "$result" = "yes"])
-dnl See if nsEmbedString.h has nsDependentString in it
-dnl https://bugzilla.mozilla.org/show_bug.cgi?id=293825
-AC_MSG_CHECKING([for nsDependentString in nsEmbedString.h])
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#define MOZILLA_STRICT_API
- #include <nsEmbedString.h>]],
- [[nsDependentCString test("test");]]
- )],
- [AC_DEFINE([HAVE_NSDEPENDENTSTRING], [1],
- [Define if nsEmbedString.h has nsDependentString in it]) result=yes],
- [result=no])
-AC_MSG_RESULT([$result])
-
dnl Another method added to nsISidebar
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=334471
AC_MSG_CHECKING([for nsISidebar::AddMicrosummaryGenerator])
Modified: trunk/mozilla/ContentHandler.cpp
==============================================================================
--- trunk/mozilla/ContentHandler.cpp (original)
+++ trunk/mozilla/ContentHandler.cpp Fri Jul 4 20:13:58 2008
@@ -217,11 +217,7 @@
* Mini progress listener so that we can listen for errors
* while downloading */
class MiniProgressListener
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
: public nsIWebProgressListener2
-#else
- : public nsIWebProgressListener
-#endif
{
public:
MiniProgressListener(MimeAskActionDialog *dialog) :
@@ -233,20 +229,13 @@
NS_DECL_ISUPPORTS
NS_DECL_NSIWEBPROGRESSLISTENER
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
NS_DECL_NSIWEBPROGRESSLISTENER2
-#endif
-
+
MimeAskActionDialog *mDialog;
};
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
NS_IMPL_ISUPPORTS2(MiniProgressListener, nsIWebProgressListener2,
nsIWebProgressListener)
-#else
-NS_IMPL_ISUPPORTS1(MiniProgressListener,
- nsIWebProgressListener)
-#endif
// ------------------------------------------------------------
@@ -272,11 +261,7 @@
/* void show (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */
NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
nsISupports *aContext,
-#ifdef HAVE_NSIHELPERAPPLAUNCHERDIALOG_SHOW_REASON
PRUint32 aReason)
-#else
- PRBool aForced)
-#endif
{
/* aForced reflects if the content being sent is normally viewable
* in mozilla or not. That fact doesn't affect us, so ignore it
@@ -421,11 +406,7 @@
}
-#ifdef HAVE_NSICANCELABLE_H
mLauncher->Cancel (NS_BINDING_ABORTED);
-#else
- mLauncher->Cancel ();
-#endif
return NS_OK;
}
@@ -506,16 +487,7 @@
char * info = g_strdup_printf ("%d:%s", gtk_get_current_event_time(),
id);
-#ifdef HAVE_NSIMIMEINFO_SETDESCRIPTION
rv = mimeInfo->SetDescription(GulString(info));
-#else
- rv = mimeInfo->SetApplicationDescription
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
- (GulString(info));
-#else
- (GulString(info).get());
-#endif
-#endif
g_free (info);
if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
@@ -535,15 +507,7 @@
nsCOMPtr<nsIMIMEInfo> MIMEInfo;
rv = mLauncher->GetMIMEInfo (getter_AddRefs(MIMEInfo));
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
rv = MIMEInfo->GetMIMEType (mMimeType);
-#else
- char *type = nsnull;
- rv = MIMEInfo->GetMIMEType (&type);
- mMimeType = type;
- nsMemory::Free (type);
-#endif
-
rv = mLauncher->GetSource(getter_AddRefs(mUri));
rv = mLauncher->GetTargetFile(getter_AddRefs(mTempFile));
@@ -563,16 +527,9 @@
// suggested filename
GulCString uriFileName;
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
GulString filename;
mLauncher->GetSuggestedFileName (filename);
uriFileName = filename;
-#else
- PRUnichar *filename = nsnull;
- mLauncher->GetSuggestedFileName(&filename);
- uriFileName = filename;
- nsMemory::Free(filename);
-#endif
#ifdef HAVE_GNOME_VFS_GET_MIME_TYPE_FOR_NAME
mMimeType.Assign(gnome_vfs_get_mime_type_for_name
@@ -599,11 +556,7 @@
* errors while the download is happening to a temporary file
* - bug 148739
*/
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
nsCOMPtr<nsIWebProgressListener2> listener = new MiniProgressListener( dialog );
-#else
- nsCOMPtr<nsIWebProgressListener> listener = new MiniProgressListener( dialog );
-#endif
mLauncher->SetWebProgressListener( listener );
return NS_OK;
@@ -726,16 +679,9 @@
// suggested filename
GulCString filename;
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
GulString uFilename;
launcher->GetSuggestedFileName (uFilename);
filename = uFilename;
-#else
- PRUnichar *uFilename = nsnull;
- launcher->GetSuggestedFileName(&uFilename);
- filename = uFilename;
- nsMemory::Free(uFilename);
-#endif
markup = g_markup_printf_escaped("<b>%s</b>", filename.get());
@@ -801,11 +747,7 @@
}
else
{
-#ifdef HAVE_NSICANCELABLE_H
launcher->Cancel(NS_BINDING_ABORTED);
-#else
- launcher->Cancel();
-#endif
dialog->mContentHandler->LaunchExternalDownloader();
}
@@ -819,11 +761,7 @@
dialog->mContentHandler->GetLauncher(getter_AddRefs(launcher));
launcher->SetWebProgressListener( nsnull );
-#ifdef HAVE_NSICANCELABLE_H
launcher->Cancel(NS_BINDING_ABORTED);
-#else
- launcher->Cancel();
-#endif
delete dialog;
}
@@ -897,11 +835,7 @@
rv = dialog->mContentHandler->GetLauncher(getter_AddRefs(launcher));
launcher->SetWebProgressListener( nsnull );
-#ifdef HAVE_NSICANCELABLE_H
launcher->Cancel(NS_BINDING_ABORTED);
-#else
- launcher->Cancel();
-#endif
}
// ------------------------------------------------------------
@@ -966,7 +900,6 @@
return NS_ERROR_NOT_IMPLEMENTED;
}
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
NS_IMETHODIMP MiniProgressListener::OnProgressChange64(nsIWebProgress *aWebProgress,
nsIRequest *aRequest, PRInt64 aCurSelfProgress,
PRInt64 aMaxSelfProgress, PRInt64 aCurTotalProgress,
@@ -984,5 +917,3 @@
}
#endif
-#endif
-
Modified: trunk/mozilla/EphyDirectoryProvider.cpp
==============================================================================
--- trunk/mozilla/EphyDirectoryProvider.cpp (original)
+++ trunk/mozilla/EphyDirectoryProvider.cpp Fri Jul 4 20:13:58 2008
@@ -44,11 +44,6 @@
#include <nsIMutableArray.h>
#endif
-#ifndef HAVE_NSDEPENDENTSTRING
-typedef nsEmbedString nsDependentString;
-typedef nsEmbedCString nsDependentCString;
-#endif
-
NS_IMPL_ISUPPORTS2 (EphyDirectoryProvider,
nsIDirectoryServiceProvider,
nsIDirectoryServiceProvider2)
Modified: trunk/mozilla/EphyPromptService.cpp
==============================================================================
--- trunk/mozilla/EphyPromptService.cpp (original)
+++ trunk/mozilla/EphyPromptService.cpp Fri Jul 4 20:13:58 2008
@@ -48,11 +48,6 @@
#include "src/galeon-shell.h"
#include "galeon-debug.h"
-#ifndef HAVE_NSDEPENDENTSTRING
-typedef nsEmbedString nsDependentString;
-typedef nsEmbedCString nsDependentCString;
-#endif
-
#define TIMEOUT 1000 /* ms */
#define TIMEOUT_DATA_KEY "timeout"
Modified: trunk/mozilla/EventContext.cpp
==============================================================================
--- trunk/mozilla/EventContext.cpp (original)
+++ trunk/mozilla/EventContext.cpp Fri Jul 4 20:13:58 2008
@@ -560,15 +560,6 @@
info->mouse_button = btn+1;
break;
-#ifdef HAVE_BROKEN_CTX_MENU_EVENT
- /* This only appears to happen when getting a mouse context menu
- * signal, so map it to button 3 (right mouse button)
- * - http://bugzilla.mozilla.org/show_bug.cgi?id=258193 */
- case 500:
- info->mouse_button = 3;
- break;
-#endif
-
case (PRUint16) -1:
/* when the user submits a form with Return, mozilla synthesises
* a _mouse_ click event with btn=65535 (-1).
@@ -914,14 +905,12 @@
{
PRBool retval = PR_FALSE;
-#ifdef HAVE_NSIDOMNSEVENT_GETISTRUSTED
/* make sure the event is trusted */
nsCOMPtr<nsIDOMNSEvent> nsEvent (do_QueryInterface (aEvent));
NS_ENSURE_TRUE (nsEvent, retval);
PRBool isTrusted = PR_FALSE;
nsEvent->GetIsTrusted (&isTrusted);
if (!isTrusted) return retval;
-#endif
/* check for alt/ctrl */
PRBool isCtrl = PR_FALSE, isAlt = PR_FALSE;
Modified: trunk/mozilla/ExternalProtocolService.cpp
==============================================================================
--- trunk/mozilla/ExternalProtocolService.cpp (original)
+++ trunk/mozilla/ExternalProtocolService.cpp Fri Jul 4 20:13:58 2008
@@ -43,12 +43,7 @@
#define WINDOWWATCHER_CONTRACTID "@mozilla.org/embedcomp/window-watcher;1"
/* Implementation file */
-#ifdef HAVE_NSPIEXTERNALPROTOCOLSERVICE
-NS_IMPL_ISUPPORTS2(GExternalProtocolService, nsIExternalProtocolService,
- nsPIExternalProtocolService)
-#else
NS_IMPL_ISUPPORTS1(GExternalProtocolService, nsIExternalProtocolService)
-#endif
GExternalProtocolService::GExternalProtocolService()
{
@@ -94,7 +89,7 @@
return NS_OK;
}
-#if defined(HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI) || defined (HAVE_NSPIEXTERNALPROTOCOLSERVICE)
+#if defined(HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI)
NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURI, nsIPrompt *)
{
/* Under some circumstances, the mozilla implementation of
@@ -178,13 +173,11 @@
return NS_OK;
}
-#ifdef HAVE_NSIEXTERNALPROTOCOLSERVICE_GETAPPDESC
NS_IMETHODIMP GExternalProtocolService::GetApplicationDescription(const nsACString & aScheme,
nsAString & _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
-#endif
#ifdef HAVE_NSIEXTERNALPROTOCOLSERVICE_GETPROTOCOLHANDLERINFO
NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfo(const nsACString & aProtocolScheme, nsIHandlerInfo **_retval)
Modified: trunk/mozilla/ExternalProtocolService.h
==============================================================================
--- trunk/mozilla/ExternalProtocolService.h (original)
+++ trunk/mozilla/ExternalProtocolService.h Fri Jul 4 20:13:58 2008
@@ -23,18 +23,11 @@
#include <nsIExternalProtocolService.h>
class GExternalProtocolService :
-#ifdef HAVE_NSPIEXTERNALPROTOCOLSERVICE
- public nsPIExternalProtocolService
-#else
public nsIExternalProtocolService
-#endif
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIEXTERNALPROTOCOLSERVICE
-#ifdef HAVE_NSPIEXTERNALPROTOCOLSERVICE
- NS_DECL_NSPIEXTERNALPROTOCOLSERVICE
-#endif
GExternalProtocolService();
virtual ~GExternalProtocolService();
Modified: trunk/mozilla/FilePicker.cpp
==============================================================================
--- trunk/mozilla/FilePicker.cpp (original)
+++ trunk/mozilla/FilePicker.cpp Fri Jul 4 20:13:58 2008
@@ -36,10 +36,6 @@
#include <nsNetCID.h>
#include <nsXPCOMCID.h>
-#ifndef HAVE_NSIFILEPICKER_NSASTRING
-#include <nsIDOMWindowInternal.h>
-#endif
-
#include "gul-string.h"
#include "prefs-strings.h"
#include "gul-gui.h"
@@ -70,11 +66,7 @@
}
/* void init (in nsIDOMWindowInternal parent, in wstring title, in short mode); */
-#ifdef HAVE_NSIFILEPICKER_NSASTRING
NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, const nsAString &title, PRInt16 mode)
-#else
-NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *title, PRInt16 mode)
-#endif
{
LOG ("GFilePicker::Init");
@@ -161,11 +153,7 @@
}
/* void appendFilter (in wstring title, in wstring filter); */
-#ifdef HAVE_NSIFILEPICKER_NSASTRING
NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString &title, const nsAString &filter)
-#else
-NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar *filter)
-#endif
{
NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);
@@ -198,30 +186,18 @@
}
/* attribute wstring defaultString; */
-#ifdef HAVE_NSIFILEPICKER_NSASTRING
NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString &aDefaultString)
-#else
-NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString)
-#endif
{
NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);
LOG ("GFilePicker::GetDefaultString");
-#ifdef HAVE_NSIFILEPICKER_NSASTRING
aDefaultString = mDefaultString;
-#else
- *aDefaultString = NS_StringCloneData (mDefaultString);
-#endif
return NS_OK;
}
-#ifdef HAVE_NSIFILEPICKER_NSASTRING
NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString &aDefaultString)
-#else
-NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString)
-#endif
{
NS_ENSURE_TRUE (mDialog, NS_ERROR_FAILURE);
@@ -245,22 +221,14 @@
}
/* attribute wstring defaultExtension; */
-#ifdef HAVE_NSIFILEPICKER_NSASTRING
NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString &aDefaultExtension)
-#else
-NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar **aDefaultExtension)
-#endif
{
LOG ("GFilePicker::GetDefaultExtension");
return NS_ERROR_NOT_IMPLEMENTED;
}
-#ifdef HAVE_NSIFILEPICKER_NSASTRING
NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString &aDefaultExtension)
-#else
-NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtension)
-#endif
{
LOG ("GFilePicker::SetDefaultExtension()");
Modified: trunk/mozilla/GaleonFind.cpp
==============================================================================
--- trunk/mozilla/GaleonFind.cpp (original)
+++ trunk/mozilla/GaleonFind.cpp Fri Jul 4 20:13:58 2008
@@ -49,32 +49,23 @@
#include <nsIDOMEventTarget.h>
#include <nsIDOMHTMLAnchorElement.h>
-#ifdef HAVE_TYPEAHEADFIND
#include <nsISimpleEnumerator.h>
#include <nsIDocShell.h>
#include <nsIDocShellTreeItem.h>
#include <nsITypeAheadFind.h>
#include <nsISelectionDisplay.h>
#include <nsISelectionController.h>
-#else
-#include <nsIWebBrowserFind.h>
-#include <nsMemory.h>
-#endif
#include <glib.h>
-#ifdef HAVE_TYPEAHEADFIND
#define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/typeaheadfind;1"
-#endif /* HAVE_TYPEAHEADFIND */
static const PRUnichar kKeyEvents[] = { 'K', 'e', 'y', 'E', 'v', 'e', 'n', 't', 's', '\0' };
static const PRUnichar kKeyPress[] = { 'k', 'e', 'y', 'p', 'r', 'e', 's', 's', '\0' };
GaleonFind::GaleonFind ()
-: mCurrentEmbed(nsnull)
-#ifdef HAVE_TYPEAHEADFIND
-, mAttention(PR_FALSE)
-#endif
+: mCurrentEmbed(nsnull),
+ mAttention(PR_FALSE)
{
LOG ("GaleonFind ctor [%p]", this);
}
@@ -100,7 +91,6 @@
getter_AddRefs (mWebBrowser));
NS_ENSURE_TRUE (mWebBrowser, rv);
-#ifdef HAVE_TYPEAHEADFIND
nsCOMPtr<nsIDocShell> docShell (do_GetInterface (mWebBrowser, &rv));
NS_ENSURE_SUCCESS (rv, rv);
@@ -118,22 +108,6 @@
rv = mFinder->SetDocShell (docShell);
}
NS_ENSURE_SUCCESS (rv, rv);
-#else
- PRUnichar *string = nsnull;
- if (mFinder) {
- mFinder->GetSearchString (&string);
- }
-
- mFinder = do_GetInterface (mWebBrowser, &rv);
- NS_ENSURE_SUCCESS (rv, rv);
-
- mFinder->SetWrapFind (PR_TRUE);
-
- if (string) {
- mFinder->SetSearchString (string);
- nsMemory::Free (string);
- }
-#endif /* HAVE_TYPEAHEADFIND */
mCurrentEmbed = aEmbed;
@@ -146,24 +120,13 @@
{
if (!mFinder) return;
-#ifdef HAVE_TYPEAHEADFIND
mFinder->SetCaseSensitive (aCaseSensitive);
/* search string is set on ::Find */
-#else
- mFinder->SetMatchCase (aCaseSensitive);
-
- nsEmbedString uSearchString;
- NS_CStringToUTF16 (nsEmbedCString (aSearchString ? aSearchString : ""),
- NS_CSTRING_ENCODING_UTF8, uSearchString);
-
- mFinder->SetSearchString (uSearchString.get ());
-#endif /* TYPEAHEADFIND */
}
void
GaleonFind::SetSelectionAttention (PRBool aAttention)
{
-#ifdef HAVE_TYPEAHEADFIND
if (aAttention && mAttention) return;
mAttention = aAttention;
@@ -210,7 +173,6 @@
controller->SetDisplaySelection (display);
}
#endif
-#endif
}
GaleonEmbedFindResult
@@ -223,29 +185,13 @@
NS_CStringToUTF16 (nsEmbedCString (aSearchString ? aSearchString : ""),
NS_CSTRING_ENCODING_UTF8, uSearchString);
-#ifdef HAVE_TYPEAHEADFIND
SetSelectionAttention (PR_TRUE);
nsresult rv;
PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND;
-#ifdef HAVE_NSITYPEAHEADFIND_FINDNOFOCUS
rv = mFinder->Find (uSearchString, aLinksOnly, &found);
-#else
- rv = mFinder->Find (uSearchString, aLinksOnly, PR_FALSE, &found);
-#endif
return (GaleonEmbedFindResult) found;
-#else
- mFinder->SetSearchString (uSearchString.get ());
- mFinder->SetFindBackwards (PR_FALSE);
-
- nsresult rv;
- PRBool didFind = PR_FALSE;
- rv = mFinder->FindNext (&didFind);
-
- return NS_SUCCEEDED (rv) && didFind ? GALEON_EMBED_FIND_FOUND :
- GALEON_EMBED_FIND_NOTFOUND;
-#endif /* HAVE_TYPEAHEADFIND */
}
GaleonEmbedFindResult
@@ -253,32 +199,15 @@
{
if (!mFinder) return GALEON_EMBED_FIND_NOTFOUND;
-#ifdef HAVE_TYPEAHEADFIND
SetSelectionAttention (PR_TRUE);
nsresult rv;
PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND;
#ifdef HAVE_NSITYPEAHEADFIND_SETSELECTIONMODEANDREPAINT
if (aForward) {
-#if defined(HAVE_NSITYPEAHEADFIND_FINDNOFOCUS)
rv = mFinder->FindAgain(PR_FALSE, aLinksOnly, &found);
-#elif defined(HAVE_NSITYPEAHEADFIND_FINDAGAIN_ALINKSONLY)
- rv = mFinder->FindAgain(PR_FALSE, aLinksOnly, PR_FALSE, &found);
-#elif defined(HAVE_NSITYPEAHEADFIND_FINDAGAIN)
- rv = mFinder->FindAgain(PR_FALSE, PR_FALSE, &found);
-#else
- rv = mFinder->FindNext (PR_FALSE, &found);
-#endif
} else {
-#if defined(HAVE_NSITYPEAHEADFIND_FINDNOFOCUS)
rv = mFinder->FindAgain(PR_TRUE, aLinksOnly, &found);
-#elif defined(HAVE_NSITYPEAHEADFIND_FINDAGAIN_ALINKSONLY)
- rv = mFinder->FindAgain(PR_TRUE, aLinksOnly, PR_FALSE, &found);
-#elif defined(HAVE_NSITYPEAHEADFIND_FINDAGAIN)
- rv = mFinder->FindAgain(PR_TRUE, PR_FALSE, &found);
-#else
- rv = mFinder->FindPrevious (PR_FALSE, &found);
-#endif
}
#else
if (aForward) {
@@ -289,16 +218,6 @@
#endif
return (GaleonEmbedFindResult) found;
-#else
- mFinder->SetFindBackwards (!aForward);
-
- nsresult rv;
- PRBool didFind = PR_FALSE;
- rv = mFinder->FindNext (&didFind);
-
- return NS_SUCCEEDED (rv) && didFind ? GALEON_EMBED_FIND_FOUND :
- GALEON_EMBED_FIND_NOTFOUND;
-#endif /* HAVE_TYPEAHEADFIND */
}
PRBool
@@ -306,21 +225,9 @@
{
nsresult rv;
nsCOMPtr<nsIDOMElement> link;
-#if defined(HAVE_TYPEAHEADFIND) && defined(HAVE_NSITYPEAHEADFIND_GETFOUNDLINK)
rv = mFinder->GetFoundLink (getter_AddRefs (link));
NS_ENSURE_TRUE (NS_SUCCEEDED (rv) && link, FALSE);
-#else
- nsCOMPtr<nsIWebBrowserFocus> focus (do_QueryInterface (mWebBrowser));
- NS_ENSURE_TRUE (focus, FALSE);
-
- rv = focus->GetFocusedElement (getter_AddRefs (link));
- NS_ENSURE_TRUE (NS_SUCCEEDED (rv) && link, FALSE);
-
- /* ensure this is really a link so we don't accidentally submit if we're on a button or so! */
- nsCOMPtr<nsIDOMHTMLAnchorElement> anchor (do_QueryInterface (link));
- if (!anchor) return FALSE;
-#endif /* HAVE_TYPEAHEADFIND && HAVE_GECKO_1_8 */
nsCOMPtr<nsIDOMDocument> doc;
rv = link->GetOwnerDocument (getter_AddRefs (doc));
Modified: trunk/mozilla/GaleonFind.h
==============================================================================
--- trunk/mozilla/GaleonFind.h (original)
+++ trunk/mozilla/GaleonFind.h Fri Jul 4 20:13:58 2008
@@ -50,12 +50,8 @@
nsCOMPtr<nsIWebBrowser> mWebBrowser;
-#ifdef HAVE_TYPEAHEADFIND
nsCOMPtr<nsITypeAheadFind> mFinder;
PRBool mAttention;
-#else
- nsCOMPtr<nsIWebBrowserFind> mFinder;
-#endif
};
#endif /* !TYPEAHEADFIND_H */
Modified: trunk/mozilla/GaleonJS.cpp
==============================================================================
--- trunk/mozilla/GaleonJS.cpp (original)
+++ trunk/mozilla/GaleonJS.cpp Fri Jul 4 20:13:58 2008
@@ -57,13 +57,8 @@
nsDependentString aScript(aRawScript);
nsAutoString ret;
-#ifdef HAVE_NSISCRIPTCONTEXT_NSASTRING_P
rv = context->EvaluateString(aScript, nsnull, nsnull, nsnull,
0, nsnull, &ret, isUndefined);
-#else
- rv = context->EvaluateString(aScript, nsnull, nsnull, nsnull,
- 0, nsnull, ret, isUndefined);
-#endif
context->SetProcessingScriptTag(PR_FALSE);
NS_ENSURE_SUCCESS (rv, rv);
Modified: trunk/mozilla/GaleonWrapper.cpp
==============================================================================
--- trunk/mozilla/GaleonWrapper.cpp (original)
+++ trunk/mozilla/GaleonWrapper.cpp Fri Jul 4 20:13:58 2008
@@ -204,28 +204,11 @@
#ifdef HAVE_MOZILLA_PSM
-#ifdef HAVE_NSIDOCSHELL_GETSECUREUI
nsCOMPtr<nsIDocShell> docShell (do_GetInterface (mWebBrowser, &rv));
NS_ENSURE_SUCCESS (rv, rv);
rv = docShell->GetSecurityUI (getter_AddRefs (mSecurityInfo));
NS_ENSURE_SUCCESS (rv, rv);
-#else
- /* FIXME: mozilla sucks! nsWebBrowser already has an instance of this,
- * but we cannot get to it!
- * See https://bugzilla.mozilla.org/show_bug.cgi?id=94974,
- * also see http://bugzilla.gnome.org/show_bug.cgi?id=164670
- */
- mSecurityInfo = do_CreateInstance("@galeon.sf.net/hacks/secure-browser-ui;1");
- if (mSecurityInfo)
- {
- mSecurityInfo->Init (DOMWindow);
- }
- else
- {
- g_warning ("Failed to instantiate nsISecureBrowserUI!\n");
- }
-#endif
#endif
return NS_OK;
@@ -1207,14 +1190,9 @@
nsCOMPtr<nsICacheEntryDescriptor> cacheEntryDescriptor;
-#ifdef HAVE_NSICACHESESSION_NSACSTRING
rv = cacheSession->OpenCacheEntry(GulDependentCString(url),
nsICache::ACCESS_READ,
PR_FALSE, aCacheEntryDescriptor);
-#else
- rv = cacheSession->OpenCacheEntry(url, nsICache::ACCESS_READ,
- PR_FALSE, aCacheEntryDescriptor);
-#endif
if (NS_SUCCEEDED (rv)) break;
}
g_free (url);
@@ -1991,7 +1969,6 @@
/* refuse if we can't check */
NS_ENSURE_TRUE (policy, NS_ERROR_FAILURE);
-#ifdef HAVE_NEW_NSICONTENTPOLICY_API
GulString typeVal;
elem->GetAttribute (NS_LITERAL_STRING ("type"), typeVal);
@@ -2003,15 +1980,6 @@
&decision);
NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
if (decision != nsIContentPolicy::ACCEPT) return NS_OK;
-#else
- PRBool shouldLoad = PR_FALSE;
- rv = policy->ShouldLoad (nsIContentPolicy::IMAGE,
- favUri, target,
- domWin,
- &shouldLoad);
- NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
- if (!shouldLoad) return NS_OK;
-#endif
/* ok, we accept this as a valid favicon for this site */
g_signal_emit_by_name (mEmbed, "ge_favicon", favicon.get());
@@ -2068,7 +2036,6 @@
NS_IMETHODIMP
GDOMModalAlertEventListener::HandleEvent (nsIDOMEvent * aDOMEvent)
{
-#ifdef HAVE_NSIDOMNSEVENT_GETISTRUSTED
NS_ENSURE_TRUE (mEmbed, NS_ERROR_FAILURE);
/* make sure the event is trusted */
@@ -2103,7 +2070,6 @@
g_signal_emit_by_name (mEmbed, "ge-modal-alert-closed");
}
-#endif
return NS_OK;
}
Modified: trunk/mozilla/GlobalHistory.cpp
==============================================================================
--- trunk/mozilla/GlobalHistory.cpp (original)
+++ trunk/mozilla/GlobalHistory.cpp Fri Jul 4 20:13:58 2008
@@ -31,11 +31,7 @@
*
*/
-#ifdef HAVE_NSIGLOBALHISTORY3_H
NS_IMPL_ISUPPORTS2(MozGlobalHistory, nsIGlobalHistory2, nsIGlobalHistory3)
-#else
-NS_IMPL_ISUPPORTS1(MozGlobalHistory, nsIGlobalHistory2)
-#endif
MozGlobalHistory::MozGlobalHistory ()
{
@@ -49,12 +45,8 @@
/* void addURI (in nsIURI aURI, in boolean aRedirect, in boolean aToplevel); */
NS_IMETHODIMP MozGlobalHistory::AddURI (nsIURI *aURI,
PRBool aRedirect,
- PRBool aTopLevel
-#ifdef HAVE_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER
- ,nsIURI *aReferrer
-#endif
-
- )
+ PRBool aTopLevel,
+ nsIURI *aReferrer)
{
nsresult rv;
NS_ENSURE_ARG_POINTER(aURI);
@@ -150,7 +142,6 @@
}
#endif
-#ifdef HAVE_NSIGLOBALHISTORY3_H
/* void addDocumentRedirect (in nsIChannel aOldChannel, in nsIChannel aNewChannel, in PRInt32 aFlags, in boolean aTopLevel); */
NS_IMETHODIMP MozGlobalHistory::AddDocumentRedirect(nsIChannel *aOldChannel,
nsIChannel *aNewChannel,
@@ -159,4 +150,3 @@
{
return NS_ERROR_NOT_IMPLEMENTED;
}
-#endif
Modified: trunk/mozilla/GlobalHistory.h
==============================================================================
--- trunk/mozilla/GlobalHistory.h (original)
+++ trunk/mozilla/GlobalHistory.h Fri Jul 4 20:13:58 2008
@@ -23,11 +23,7 @@
#include "config.h"
#endif
-#ifdef HAVE_NSIGLOBALHISTORY3_H
#include <nsIGlobalHistory3.h>
-#else
-#include <nsIGlobalHistory2.h>
-#endif
#include "global-history.h"
@@ -37,11 +33,7 @@
{ 0xbe0c42c1, 0x39d4, 0x4271, { 0xb7, 0x9e, 0xf7, 0xaa, 0x49, 0xeb, 0x6a, 0x15}}
class MozGlobalHistory:
-#ifdef HAVE_NSIGLOBALHISTORY3_H
public nsIGlobalHistory3
-#else
- public nsIGlobalHistory2
-#endif
{
public:
MozGlobalHistory ();
@@ -49,9 +41,7 @@
NS_DECL_ISUPPORTS
NS_DECL_NSIGLOBALHISTORY2
-#ifdef HAVE_NSIGLOBALHISTORY3_H
NS_DECL_NSIGLOBALHISTORY3
-#endif
private:
GlobalHistory *mGlobalHistory;
Modified: trunk/mozilla/GtkNSSKeyPairDialogs.cpp
==============================================================================
--- trunk/mozilla/GtkNSSKeyPairDialogs.cpp (original)
+++ trunk/mozilla/GtkNSSKeyPairDialogs.cpp Fri Jul 4 20:13:58 2008
@@ -46,11 +46,7 @@
#include <nsIInterfaceRequestorUtils.h>
#include <nsIKeygenThread.h>
#include <nsIDOMWindow2.h>
-#ifndef HAVE_NSIKEYGENTHREAD_NSIOBSERVER
-# include <nsIDOMWindowInternal.h>
-#else
-# include <nsIObserver.h>
-#endif
+#include <nsIObserver.h>
#include "gtk/gtkdialog.h"
#include "gtk/gtkprogressbar.h"
@@ -77,43 +73,6 @@
NS_IMPL_ISUPPORTS1 (GtkNSSKeyPairDialogs,
nsIGeneratingKeypairInfoDialogs)
-#ifndef HAVE_NSIKEYGENTHREAD_NSIOBSERVER
-
-/* ------------------------------------------------------------
- * A dummy implementation of nsIDomWindowInternal so that
- * we can use the correctly get callbacks from the
- * nsIKeygenThread */
-class KeyPairHelperWindow : public nsIDOMWindowInternal
-{
-public:
- NS_DECL_ISUPPORTS
- NS_DECL_NSIDOMWINDOWINTERNAL
- NS_DECL_NSIDOMWINDOW
- NS_DECL_NSIDOMWINDOW2
-
- KeyPairHelperWindow();
- virtual ~KeyPairHelperWindow();
-
- gboolean close_called;
-};
-
-NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2)
-
-KeyPairHelperWindow::KeyPairHelperWindow()
-{
- close_called = FALSE;
-}
-
-NS_IMETHODIMP KeyPairHelperWindow::Close()
-{
- /* This is called in a different thread, so just set a flag, dont
- * call the dialog_response directly */
- close_called = TRUE;
- return NS_OK;
-}
-
-#else
-
/* ------------------------------------------------------------
* Rock on biesi :-)
*/
@@ -138,7 +97,6 @@
return NS_OK;
}
-#endif
/* ------------------------------------------------------------ */
static void
begin_busy (GtkWidget *widget)
@@ -164,11 +122,7 @@
{
GtkWidget *progress;
GtkWidget *dialog;
-#ifndef HAVE_NSIKEYGENTHREAD_NSIOBSERVER
- KeyPairHelperWindow *helper;
-#else
KeyPairObserver *helper;
-#endif
};
@@ -230,11 +184,7 @@
/* Create a helper class that just waits for close events
* from the other thread */
-#ifndef HAVE_NSIKEYGENTHREAD_NSIOBSERVER
- nsCOMPtr<KeyPairHelperWindow> helper = new KeyPairHelperWindow;
-#else
nsCOMPtr<KeyPairObserver> helper = new KeyPairObserver;
-#endif
KeyPairInfo callback_data = { progress, dialog, helper };
timeout_id = g_timeout_add (100, (GSourceFunc)generating_timeout_cb, &callback_data);
@@ -261,493 +211,4 @@
}
-#ifndef HAVE_NSIKEYGENTHREAD_NSIOBSERVER
-
-/*************************************************************
- * Misc functions for the nsIDomWindowInternal implementation
- * that arn't needed for our purposes
- *************************************************************/
-
-#define MOZ_NOT_IMPLEMENTED { g_warning ("not implemented: %s", G_STRLOC); \
- return NS_ERROR_NOT_IMPLEMENTED; }
-
-KeyPairHelperWindow::~KeyPairHelperWindow()
-{
-}
-
-/* readonly attribute nsIDOMWindowInternal window; */
-NS_IMETHODIMP KeyPairHelperWindow::GetWindow(nsIDOMWindowInternal * *aWindow)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aEvent)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMWindowInternal self; */
-NS_IMETHODIMP KeyPairHelperWindow::GetSelf(nsIDOMWindowInternal * *aSelf)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMNavigator navigator; */
-NS_IMETHODIMP KeyPairHelperWindow::GetNavigator(nsIDOMNavigator * *aNavigator)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMScreen screen; */
-NS_IMETHODIMP KeyPairHelperWindow::GetScreen(nsIDOMScreen * *aScreen)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMHistory history; */
-NS_IMETHODIMP KeyPairHelperWindow::GetHistory(nsIDOMHistory * *aHistory)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMWindow content; */
-NS_IMETHODIMP KeyPairHelperWindow::GetContent(nsIDOMWindow * *aContent)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* [noscript] readonly attribute nsIPrompt prompter; */
-NS_IMETHODIMP KeyPairHelperWindow::GetPrompter(nsIPrompt * *aPrompter)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMBarProp menubar; */
-NS_IMETHODIMP KeyPairHelperWindow::GetMenubar(nsIDOMBarProp * *aMenubar)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMBarProp toolbar; */
-NS_IMETHODIMP KeyPairHelperWindow::GetToolbar(nsIDOMBarProp * *aToolbar)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMBarProp locationbar; */
-NS_IMETHODIMP KeyPairHelperWindow::GetLocationbar(nsIDOMBarProp * *aLocationbar)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMBarProp personalbar; */
-NS_IMETHODIMP KeyPairHelperWindow::GetPersonalbar(nsIDOMBarProp * *aPersonalbar)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMBarProp statusbar; */
-NS_IMETHODIMP KeyPairHelperWindow::GetStatusbar(nsIDOMBarProp * *aStatusbar)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMBarProp directories; */
-NS_IMETHODIMP KeyPairHelperWindow::GetDirectories(nsIDOMBarProp * *aDirectories)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute boolean closed; */
-NS_IMETHODIMP KeyPairHelperWindow::GetClosed(PRBool *aClosed)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMCrypto crypto; */
-NS_IMETHODIMP KeyPairHelperWindow::GetCrypto(nsIDOMCrypto * *aCrypto)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMPkcs11 pkcs11; */
-NS_IMETHODIMP KeyPairHelperWindow::GetPkcs11(nsIDOMPkcs11 * *aPkcs11)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIControllers controllers; */
-NS_IMETHODIMP KeyPairHelperWindow::GetControllers(nsIControllers * *aControllers)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute nsIDOMWindowInternal opener; */
-NS_IMETHODIMP KeyPairHelperWindow::GetOpener(nsIDOMWindowInternal * *aOpener)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetOpener(nsIDOMWindowInternal * aOpener)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute DOMString status; */
-NS_IMETHODIMP KeyPairHelperWindow::GetStatus(nsAString & aStatus)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetStatus(const nsAString & aStatus)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute DOMString defaultStatus; */
-NS_IMETHODIMP KeyPairHelperWindow::GetDefaultStatus(nsAString & aDefaultStatus)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetDefaultStatus(const nsAString & aDefaultStatus)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMLocation location; */
-NS_IMETHODIMP KeyPairHelperWindow::GetLocation(nsIDOMLocation * *aLocation)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute long innerWidth; */
-NS_IMETHODIMP KeyPairHelperWindow::GetInnerWidth(PRInt32 *aInnerWidth)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetInnerWidth(PRInt32 aInnerWidth)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute long innerHeight; */
-NS_IMETHODIMP KeyPairHelperWindow::GetInnerHeight(PRInt32 *aInnerHeight)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetInnerHeight(PRInt32 aInnerHeight)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute long outerWidth; */
-NS_IMETHODIMP KeyPairHelperWindow::GetOuterWidth(PRInt32 *aOuterWidth)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetOuterWidth(PRInt32 aOuterWidth)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute long outerHeight; */
-NS_IMETHODIMP KeyPairHelperWindow::GetOuterHeight(PRInt32 *aOuterHeight)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetOuterHeight(PRInt32 aOuterHeight)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute long screenX; */
-NS_IMETHODIMP KeyPairHelperWindow::GetScreenX(PRInt32 *aScreenX)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetScreenX(PRInt32 aScreenX)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute long screenY; */
-NS_IMETHODIMP KeyPairHelperWindow::GetScreenY(PRInt32 *aScreenY)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetScreenY(PRInt32 aScreenY)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute long pageXOffset; */
-NS_IMETHODIMP KeyPairHelperWindow::GetPageXOffset(PRInt32 *aPageXOffset)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute long pageYOffset; */
-NS_IMETHODIMP KeyPairHelperWindow::GetPageYOffset(PRInt32 *aPageYOffset)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute long scrollMaxX; */
-NS_IMETHODIMP KeyPairHelperWindow::GetScrollMaxX(PRInt32 *aScrollMaxX)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute long scrollMaxY; */
-NS_IMETHODIMP KeyPairHelperWindow::GetScrollMaxY(PRInt32 *aScrollMaxY)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute unsigned long length; */
-NS_IMETHODIMP KeyPairHelperWindow::GetLength(PRUint32 *aLength)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute boolean fullScreen; */
-NS_IMETHODIMP KeyPairHelperWindow::GetFullScreen(PRBool *aFullScreen)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetFullScreen(PRBool aFullScreen)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void alert (in DOMString text); */
-NS_IMETHODIMP KeyPairHelperWindow::Alert(const nsAString & text)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* boolean confirm (in DOMString text); */
-NS_IMETHODIMP KeyPairHelperWindow::Confirm(const nsAString & text, PRBool *_retval)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* DOMString prompt (in DOMString aMessage, in DOMString aInitial, in DOMString aTitle, in unsigned long aSavePassword); */
-NS_IMETHODIMP KeyPairHelperWindow::Prompt(const nsAString & aMessage, const nsAString & aInitial, const nsAString & aTitle, PRUint32 aSavePassword, nsAString & _retval)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void focus (); */
-NS_IMETHODIMP KeyPairHelperWindow::Focus()
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void blur (); */
-NS_IMETHODIMP KeyPairHelperWindow::Blur()
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void back (); */
-NS_IMETHODIMP KeyPairHelperWindow::Back()
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void forward (); */
-NS_IMETHODIMP KeyPairHelperWindow::Forward()
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void home (); */
-NS_IMETHODIMP KeyPairHelperWindow::Home()
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void stop (); */
-NS_IMETHODIMP KeyPairHelperWindow::Stop()
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void print (); */
-NS_IMETHODIMP KeyPairHelperWindow::Print()
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void moveTo (in long xPos, in long yPos); */
-NS_IMETHODIMP KeyPairHelperWindow::MoveTo(PRInt32 xPos, PRInt32 yPos)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void moveBy (in long xDif, in long yDif); */
-NS_IMETHODIMP KeyPairHelperWindow::MoveBy(PRInt32 xDif, PRInt32 yDif)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void resizeTo (in long width, in long height); */
-NS_IMETHODIMP KeyPairHelperWindow::ResizeTo(PRInt32 width, PRInt32 height)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void resizeBy (in long widthDif, in long heightDif); */
-NS_IMETHODIMP KeyPairHelperWindow::ResizeBy(PRInt32 widthDif, PRInt32 heightDif)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void scroll (in long xScroll, in long yScroll); */
-NS_IMETHODIMP KeyPairHelperWindow::Scroll(PRInt32 xScroll, PRInt32 yScroll)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* [noscript] nsIDOMWindow open (in DOMString url, in DOMString name, in DOMString options); */
-NS_IMETHODIMP KeyPairHelperWindow::Open(const nsAString & url, const nsAString & name, const nsAString & options, nsIDOMWindow **_retval)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* [noscript] nsIDOMWindow openDialog (in DOMString url, in DOMString name, in DOMString options, in nsISupports aExtraArgument); */
-NS_IMETHODIMP KeyPairHelperWindow::OpenDialog(const nsAString & url, const nsAString & name, const nsAString & options, nsISupports *aExtraArgument, nsIDOMWindow **_retval)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void updateCommands (in DOMString action); */
-NS_IMETHODIMP KeyPairHelperWindow::UpdateCommands(const nsAString & action)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* [noscript] boolean find (in DOMString str, in boolean caseSensitive, in boolean backwards, in boolean wrapAround, in boolean wholeWord, in boolean searchInFrames, in boolean showDialog); */
-NS_IMETHODIMP KeyPairHelperWindow::Find(const nsAString & str, PRBool caseSensitive, PRBool backwards, PRBool wrapAround, PRBool wholeWord, PRBool searchInFrames, PRBool showDialog, PRBool *_retval)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* DOMString atob (in DOMString aAsciiString); */
-NS_IMETHODIMP KeyPairHelperWindow::Atob(const nsAString & aAsciiString, nsAString & _retval)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* DOMString btoa (in DOMString aBase64Data); */
-NS_IMETHODIMP KeyPairHelperWindow::Btoa(const nsAString & aBase64Data, nsAString & _retval)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMElement frameElement; */
-NS_IMETHODIMP KeyPairHelperWindow::GetFrameElement(nsIDOMElement * *aFrameElement)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-
-/* readonly attribute nsIDOMDocument document; */
-NS_IMETHODIMP KeyPairHelperWindow::GetDocument(nsIDOMDocument * *aDocument)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMWindow parent; */
-NS_IMETHODIMP KeyPairHelperWindow::GetParent(nsIDOMWindow * *aParent)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMWindow top; */
-NS_IMETHODIMP KeyPairHelperWindow::GetTop(nsIDOMWindow * *aTop)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute nsIDOMBarProp scrollbars; */
-NS_IMETHODIMP KeyPairHelperWindow::GetScrollbars(nsIDOMBarProp * *aScrollbars)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* [noscript] readonly attribute nsIDOMWindowCollection frames; */
-NS_IMETHODIMP KeyPairHelperWindow::GetFrames(nsIDOMWindowCollection * *aFrames)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* attribute DOMString name; */
-NS_IMETHODIMP KeyPairHelperWindow::GetName(nsAString & aName)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetName(const nsAString & aName)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* [noscript] attribute float textZoom; */
-NS_IMETHODIMP KeyPairHelperWindow::GetTextZoom(float *aTextZoom)
-{
- MOZ_NOT_IMPLEMENTED
-}
-NS_IMETHODIMP KeyPairHelperWindow::SetTextZoom(float aTextZoom)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute long scrollX; */
-NS_IMETHODIMP KeyPairHelperWindow::GetScrollX(PRInt32 *aScrollX)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* readonly attribute long scrollY; */
-NS_IMETHODIMP KeyPairHelperWindow::GetScrollY(PRInt32 *aScrollY)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void scrollTo (in long xScroll, in long yScroll); */
-NS_IMETHODIMP KeyPairHelperWindow::ScrollTo(PRInt32 xScroll, PRInt32 yScroll)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void scrollBy (in long xScrollDif, in long yScrollDif); */
-NS_IMETHODIMP KeyPairHelperWindow::ScrollBy(PRInt32 xScrollDif, PRInt32 yScrollDif)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* nsISelection getSelection (); */
-NS_IMETHODIMP KeyPairHelperWindow::GetSelection(nsISelection **_retval)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void scrollByLines (in long numLines); */
-NS_IMETHODIMP KeyPairHelperWindow::ScrollByLines(PRInt32 numLines)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void scrollByPages (in long numPages); */
-NS_IMETHODIMP KeyPairHelperWindow::ScrollByPages(PRInt32 numPages)
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-/* void sizeToContent (); */
-NS_IMETHODIMP KeyPairHelperWindow::SizeToContent()
-{
- MOZ_NOT_IMPLEMENTED
-}
-
-#endif
#endif
Modified: trunk/mozilla/HeaderSniffer.cpp
==============================================================================
--- trunk/mozilla/HeaderSniffer.cpp (original)
+++ trunk/mozilla/HeaderSniffer.cpp Fri Jul 4 20:13:58 2008
@@ -214,17 +214,7 @@
{
nsCOMPtr<nsIMIMEService> mimeService (do_GetService(NS_MIMESERVICE_CONTRACTID));
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
mimeService->GetTypeFromURI (mFinalURL, contentType);
-#else
- char *type = nsnull;
- rv = mimeService->GetTypeFromURI (mFinalURL, &type);
- if (NS_SUCCEEDED (rv))
- {
- contentType = type;
- nsMemory::Free (type);
- }
-#endif
}
/* Calculate whether we whould decode */
@@ -241,15 +231,9 @@
GulCString extension;
resultURL->GetFileExtension (extension);
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
rv = helperService->ApplyDecodingForExtension (extension,
contentEncoding,
&mShouldDecode);
-#else
- rv = helperService->ApplyDecodingForExtension (extension.get(),
- contentEncoding.get(),
- &mShouldDecode);
-#endif
if (NS_FAILED (rv))
{
@@ -323,21 +307,12 @@
nsCOMPtr<nsIMIMEService> mimeService (do_GetService(NS_MIMESERVICE_CONTRACTID));
nsCOMPtr<nsIMIMEInfo> mimeInfo;
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
mimeService->GetFromTypeAndExtension (aContentType, extension,
getter_AddRefs (mimeInfo));
-#else
- mimeService->GetFromTypeAndExtension (aContentType.get(), extension.get(),
- getter_AddRefs (mimeInfo));
-#endif
if (extension.Length() && mimeInfo)
{
PRBool exists = PR_FALSE;
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
mimeInfo->ExtensionExists (extension, &exists);
-#else
- mimeInfo->ExtensionExists (extension.get(), &exists);
-#endif
if (exists)
{
_retval = extension;
@@ -356,11 +331,7 @@
if (urlExtension.Length() && mimeInfo)
{
PRBool exists = PR_FALSE;
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
mimeInfo->ExtensionExists (urlExtension, &exists);
-#else
- mimeInfo->ExtensionExists (urlExtension.get(), &exists);
-#endif
if (exists)
{
_retval = urlExtension;
@@ -372,22 +343,11 @@
* primary extension if the mime type has one */
if( mimeInfo )
{
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
rv = mimeInfo->GetPrimaryExtension (_retval);
if (NS_SUCCEEDED (rv))
{
return NS_OK;
}
-#else
- char *ext = nsnull;
- rv = mimeInfo->GetPrimaryExtension (&ext);
- if (NS_SUCCEEDED (rv))
- {
- _retval = ext;
- nsMemory::Free (ext);
- return NS_OK;
- }
-#endif
}
_retval = extension.Length() ? extension : urlExtension;
Modified: trunk/mozilla/JSConsoleListener.cpp
==============================================================================
--- trunk/mozilla/JSConsoleListener.cpp (original)
+++ trunk/mozilla/JSConsoleListener.cpp Fri Jul 4 20:13:58 2008
@@ -76,17 +76,10 @@
type = GALEON_JS_CONSOLE_ERROR;
}
-#ifdef HAVE_SCRIPTERROR_NSASTRING
GulString sourceName;
error->GetSourceName (sourceName);
GulString sourceLine;
error->GetSourceLine (sourceLine);
-#else
- PRUnichar *sourceName;
- error->GetSourceName (&sourceName);
- PRUnichar *sourceLine;
- error->GetSourceLine (&sourceLine);
-#endif
PRUint32 lineNumber;
error->GetLineNumber (&lineNumber);
PRUint32 columnNumber;
@@ -99,10 +92,6 @@
lineNumber,
GulCString(sourceLine).get(),
columnNumber);
-#ifndef HAVE_SCRIPTERROR_NSASTRING
- nsMemory::Free (sourceName);
- nsMemory::Free (sourceLine);
-#endif
}
else
{
Modified: trunk/mozilla/MozRegisterComponents.cpp
==============================================================================
--- trunk/mozilla/MozRegisterComponents.cpp (original)
+++ trunk/mozilla/MozRegisterComponents.cpp Fri Jul 4 20:13:58 2008
@@ -268,41 +268,6 @@
return NS_OK;
}
-#if defined(HAVE_MOZILLA_PSM) && ! defined(HAVE_NSIDOCSHELL_GETSECUREUI)
-/* feb0fe98-f5ee-4d26-ad76-70856de63720 */
-#define NEW_CID { 0xfeb0fe98, 0xf5ee, 0x4d26, { 0xad, 0x76, 0x70, 0x85, 0x6d, 0xe6, 0x37, 0x20 } }
-
-static nsresult
-reregister_secure_browser_ui (nsIComponentManager *cm, nsIComponentRegistrar *cr)
-{
- nsresult rv;
-
- /* Workaround as a result of:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=94974
- * see
- * http://bugzilla.gnome.org/show_bug.cgi?id=164670
- */
- nsCOMPtr<nsIFactory> factory;
- rv = cm->GetClassObjectByContractID ("@mozilla.org/secure_browser_ui;1",
- NS_GET_IID(nsIFactory), getter_AddRefs (factory));
- NS_ENSURE_SUCCESS (rv, rv);
-
- nsCID *cidPtr = nsnull;
- rv = cr->ContractIDToCID("@mozilla.org/secure_browser_ui;1", &cidPtr);
- NS_ENSURE_SUCCESS (rv, rv);
-
- rv = cr->UnregisterFactory (*cidPtr, factory);
- NS_ENSURE_SUCCESS (rv, rv);
-
- const nsCID new_cid = NEW_CID;
- rv = cr->RegisterFactory (new_cid, "Galeon Secure Browser Class",
- "@galeon.sf.net/hacks/secure-browser-ui;1", factory);
- NS_ENSURE_SUCCESS (rv, rv);
-
- return NS_OK;
-}
-#endif
-
gboolean
mozilla_register_components (void)
{
@@ -362,10 +327,5 @@
// Thunderbird includes a fascist content policy - we don't need it
remove_thunderbird_contentpolicy ();
-#if defined(HAVE_MOZILLA_PSM) && ! defined(HAVE_NSIDOCSHELL_GETSECUREUI)
- // Workaround for http://bugzilla.gnome.org/show_bug.cgi?id=164670
- reregister_secure_browser_ui (cm, cr);
-#endif
-
return ret;
}
Modified: trunk/mozilla/MozillaPrivate.cpp
==============================================================================
--- trunk/mozilla/MozillaPrivate.cpp (original)
+++ trunk/mozilla/MozillaPrivate.cpp Fri Jul 4 20:13:58 2008
@@ -158,20 +158,11 @@
nsCOMPtr<nsIPresShell> presShell;
aDocShell->GetPresShell (getter_AddRefs(presShell));
NS_ENSURE_TRUE (presShell, NS_ERROR_FAILURE);
-
-#ifdef HAVE_NSIPRESSHELL_DECOMTAMINATE
+
nsIDocument *doc = presShell->GetDocument();
-#else
- nsCOMPtr<nsIDocument> doc;
- presShell->GetDocument(getter_AddRefs(doc));
-#endif
NS_ENSURE_TRUE (doc, NS_ERROR_FAILURE);
-#ifdef HAVE_NSIDOCUMENT_CSSLOADER
nsICSSLoader *loader = doc->CSSLoader();
-#else
- nsICSSLoader *loader = doc->GetCSSLoader();
-#endif
NS_ENSURE_TRUE (loader, NS_ERROR_FAILURE);
#ifdef HAVE_NSSTRING_INTERNAL
@@ -242,13 +233,8 @@
*isUndefined = PR_TRUE;
nsAutoString ret;
-#ifdef HAVE_NSISCRIPTCONTEXT_NSASTRING_P
rv = context->EvaluateString(aScript, nsnull, nsnull, nsnull,
0, nsnull, &ret, isUndefined);
-#else
- rv = context->EvaluateString(aScript, nsnull, nsnull, nsnull,
- 0, nsnull, ret, isUndefined);
-#endif
context->SetProcessingScriptTag(PR_FALSE);
NS_ENSURE_SUCCESS (rv, rv);
Modified: trunk/mozilla/MyportalProtocolHandler.cpp
==============================================================================
--- trunk/mozilla/MyportalProtocolHandler.cpp (original)
+++ trunk/mozilla/MyportalProtocolHandler.cpp Fri Jul 4 20:13:58 2008
@@ -49,11 +49,7 @@
#include "gul-general.h"
#include "src/galeon-shell.h"
-#ifdef HAVE_CHECKLOADURI_CAPABILITIES
-# define FILE_PREFIX ""
-#else
-# define FILE_PREFIX "myportal:url:"
-#endif
+#define FILE_PREFIX ""
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
static NS_DEFINE_CID(kInputStreamChannelCID, NS_INPUTSTREAMCHANNEL_CID);
@@ -146,16 +142,7 @@
if (NS_SUCCEEDED (rv)) return NS_OK;
}
-#ifndef HAVE_CHECKLOADURI_CAPABILITIES
- if (path.StartsWith ("url:"))
- {
- rv = RedirectURL (path.get() + 4, _retval);
- }
- else
-#endif
- {
- rv = CreateMyportalPage (path.get(), aURI, _retval);
- }
+ rv = CreateMyportalPage (path.get(), aURI, _retval);
}
return rv;
}
Modified: trunk/mozilla/ProgressListener.cpp
==============================================================================
--- trunk/mozilla/ProgressListener.cpp (original)
+++ trunk/mozilla/ProgressListener.cpp Fri Jul 4 20:13:58 2008
@@ -51,18 +51,8 @@
static const PRInt64 kInterval = 500000; /* in microsecs == 500ms == 0.5s */
static const PRInt64 kUnknownSizeInterval = 150000; /* in microsecs == 150ms == 0.15s */
-#ifdef HAVE_NSITRANSFER_H
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
NS_IMPL_ISUPPORTS4(GProgressListener, nsIWebProgressListener, nsIWebProgressListener2,
nsITransfer, nsISupportsWeakReference)
-#else
-NS_IMPL_ISUPPORTS3(GProgressListener, nsIWebProgressListener,
- nsITransfer, nsISupportsWeakReference)
-#endif
-#else
-NS_IMPL_ISUPPORTS4(GProgressListener, nsIWebProgressListener,
- nsIDownload, nsITransfer, nsISupportsWeakReference)
-#endif
//---------------------------------------------------------------------------
@@ -87,12 +77,7 @@
//---------------------------------------------------------------------------
GProgressListener::GProgressListener () :
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
mCancelable(nsnull),
-#else
- mPersist(nsnull),
- mObserver(nsnull),
-#endif
mGaleonPersist(nsnull),
mDownload(nsnull),
mContentLength(-1),
@@ -114,13 +99,7 @@
/* fill in download details */
mUri = aURI;
mFile = aFile;
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
mCancelable = aPersist;
-#else
- mPersist = aPersist;
- /* pick up progress messages */
- mPersist->SetProgressListener (this);
-#endif
mGaleonPersist = (GaleonEmbedPersist *) g_object_ref (galeonPersist);
@@ -193,29 +172,15 @@
NS_IMETHODIMP GProgressListener::Init(nsIURI *aSource,
nsIURI *aTarget,
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
const nsAString &aDisplayName,
-#else
- const PRUnichar *aDisplayName,
-#endif
nsIMIMEInfo *aMIMEInfo,
PRInt64 aStartTime,
-#if HAVE_NSITRANSFER_TEMPFILE
nsILocalFile *aTempFile,
-#endif
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
nsICancelable *aCancelable)
-#else
- nsIWebBrowserPersist *aPersist)
-#endif
{
mUri = aSource;
mStartTime = aStartTime;
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
mCancelable = aCancelable;
-#else
- mPersist = aPersist;
-#endif
mTarget = aTarget;
nsCOMPtr<nsIFileURL> tFileUrl = do_QueryInterface(mTarget);
@@ -249,113 +214,6 @@
return PrivateInit();
}
-#ifndef HAVE_NSITRANSFER_H
-/* attribute long long startTime; */
-NS_IMETHODIMP GProgressListener::GetStartTime(PRInt64 *aStartTime)
-{
- *aStartTime = mStartTime;
- return NS_OK;
-}
-
-
-/* attribute nsIURI source; */
-NS_IMETHODIMP GProgressListener::GetSource(nsIURI * *aSource)
-{
- NS_IF_ADDREF(*aSource = mUri);
- return NS_OK;
-}
-
-/* attribute nsIURI target; */
-NS_IMETHODIMP GProgressListener::GetTarget(nsIURI * *aTarget)
-{
- NS_IF_ADDREF(*aTarget = mTarget);
- return NS_OK;
-}
-
-/* attribute nsILocalFile targetFile; */
-NS_IMETHODIMP GProgressListener::GetTargetFile(nsILocalFile * *aTarget)
-{
- nsCOMPtr<nsILocalFile> localFile = do_QueryInterface(mFile);
- NS_IF_ADDREF(*aTarget = localFile);
- return NS_OK;
-}
-
-NS_IMETHODIMP GProgressListener::GetMIMEInfo(nsIMIMEInfo * *aMIMEInfo)
-{
- NS_IF_ADDREF(*aMIMEInfo = mMIMEInfo);
- return NS_OK;
-}
-
-/* readonly attribute PRInt32 percentComplete; */
-NS_IMETHODIMP GProgressListener::GetPercentComplete(PRInt32 *aPercentComplete)
-{
- *aPercentComplete = 0;
- return NS_OK;
-}
-
-#ifdef HAVE_NSIDOWNLOAD_GETSIZE
-/* readonly attribute PRUint64 amountTransferred; */
-NS_IMETHODIMP GProgressListener::GetAmountTransferred(PRUint64 *aAmountTransferred)
-{
- *aAmountTransferred = 0;
- return NS_OK;
-}
-
-
-/* readonly attribute PRUint64 size; */
-NS_IMETHODIMP GProgressListener::GetSize(PRUint64 *aSize)
-{
- *aSize = 0;
- return NS_OK;
-}
-#endif
-
-/* attribute wstring displayName; */
-NS_IMETHODIMP GProgressListener::GetDisplayName(PRUnichar * *aDisplayName)
-{
- *aDisplayName = nsnull;
- return NS_OK;
-}
-NS_IMETHODIMP GProgressListener::SetDisplayName(const PRUnichar * aDisplayName)
-{
- return NS_OK;
-}
-
-NS_IMETHODIMP GProgressListener::GetPersist(nsIWebBrowserPersist * *aPersist)
-{
- NS_IF_ADDREF(*aPersist = mPersist);
- return NS_OK;
-}
-
-#endif
-
-#ifndef HAVE_NSITRANSFER_NSICANCELABLE
-/* attribute nsIObserver observer; */
-NS_IMETHODIMP GProgressListener::GetObserver(nsIObserver * *aObserver)
-{
- NS_IF_ADDREF(*aObserver = mObserver);
- return NS_OK;
-}
-NS_IMETHODIMP GProgressListener::SetObserver(nsIObserver * aObserver)
-{
- mObserver = aObserver;
- return NS_OK;
-}
-#endif
-
-/* attribute nsIWebProgressListener listener; */
-#ifndef HAVE_NSIWEBPROGRESSLISTENER2_H
-NS_IMETHODIMP GProgressListener::GetListener(nsIWebProgressListener * *aListener)
-{
- *aListener = nsnull;
- return NS_OK;
-}
-NS_IMETHODIMP GProgressListener::SetListener(nsIWebProgressListener * aListener)
-{
- return NS_OK;
-}
-#endif
-
static void LaunchHandler (GnomeVFSMimeApplication *aHandler, nsIFile *aFile,
guint32 user_time)
{
@@ -421,16 +279,8 @@
// so kungfu is needed to survive just long enough to do the
// final clean up.
nsCOMPtr<nsITransfer> kungFuDeathGrip(this);
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
mCancelable = nsnull;
-#else
- if (mPersist)
- {
- mPersist->SetProgressListener(nsnull);
- mPersist = nsnull;
- }
-#endif
-
+
if (NS_SUCCEEDED(aStatus))
{
if (mAddToRecent)
@@ -545,11 +395,7 @@
* in long long aCurTotalProgress,
* in long long aMaxTotalProgress);
*/
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
NS_IMETHODIMP GProgressListener::
-#else
-NS_METHOD GProgressListener::
-#endif
OnProgressChange64 (nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
PRInt64 aCurSelfProgress,
@@ -733,18 +579,7 @@
if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
GulString helperDesc;
-#ifdef HAVE_NSIMIMEINFO_SETDESCRIPTION
rv = mMIMEInfo->GetDescription(helperDesc);
-#else
-#ifdef HAVE_NSIMIMEINFO_NSASTRING
- rv = mMIMEInfo->GetApplicationDescription(helperDesc);
-#else
- PRUnichar *tmp;
- rv = mMIMEInfo->GetApplicationDescription (&tmp);
- helperDesc = tmp;
- nsMemory::Free (tmp);
-#endif
-#endif
if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
// XXX information passing kludge (from ContentHandler)
@@ -826,7 +661,6 @@
mRequest->Resume ();
}
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
if (mCancelable)
{
nsresult rv;
@@ -838,18 +672,6 @@
return rv;
}
}
-#else
- if (mObserver)
- {
- mObserver->Observe(NS_ISUPPORTS_CAST(nsITransfer*, this),
- "oncancel", nsnull);
- }
-
- if (mPersist)
- {
- return mPersist->CancelSave ();
- }
-#endif
// Working assumption is that if mPersist is set CancelSave correctly
// emits proper events to OnStateChange. At the time of writing that
@@ -906,10 +728,8 @@
rv = listener->InitForPersist (webPersist, displayURI, inDestFile, embedPersist);
NS_ENSURE_SUCCESS (rv, rv);
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
rv = webPersist->SetProgressListener (listener);
NS_ENSURE_SUCCESS (rv, rv);
-#endif
PRInt32 persist_flags = nsIWebBrowserPersist::PERSIST_FLAGS_REPLACE_EXISTING_FILES;
if (!domDocument && !decode)
Modified: trunk/mozilla/ProgressListener.h
==============================================================================
--- trunk/mozilla/ProgressListener.h (original)
+++ trunk/mozilla/ProgressListener.h Fri Jul 4 20:13:58 2008
@@ -31,11 +31,7 @@
#include <gtk/gtkwidget.h>
-#ifdef HAVE_NSITRANSFER_H
#include <nsITransfer.h>
-#else
-#include <nsIDownload.h>
-#endif
#include <nsIWebProgressListener.h>
#include <nsCOMPtr.h>
#include <nsWeakReference.h>
@@ -65,30 +61,13 @@
#define G_PROGRESSDIALOG_CONTRACTID "@mozilla.org/progressdialog;1"
class GProgressListener :
-#ifdef HAVE_NSITRANSFER_H
public nsITransfer,
-#else
- public nsIDownload,
- public nsIWebProgressListener,
-#endif
public nsSupportsWeakReference
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIWEBPROGRESSLISTENER
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
NS_DECL_NSIWEBPROGRESSLISTENER2
-#else
- NS_METHOD OnProgressChange64 (nsIWebProgress *aWebProgress,
- nsIRequest *aRequest,
- PRInt64 aCurSelfProgress,
- PRInt64 aMaxSelfProgress,
- PRInt64 aCurTotalProgress,
- PRInt64 aMaxTotalProgress);
-#endif
-#ifndef HAVE_NSITRANSFER_H
- NS_DECL_NSIDOWNLOAD
-#endif
NS_DECL_NSITRANSFER
GProgressListener ();
@@ -108,12 +87,7 @@
NS_METHOD LaunchHelperApp (void);
NS_METHOD SetRequest (nsIRequest *aRequest);
-#ifdef HAVE_NSITRANSFER_NSICANCELABLE
nsCOMPtr<nsICancelable> mCancelable;
-#else
- nsCOMPtr<nsIWebBrowserPersist> mPersist;
- nsCOMPtr<nsIObserver> mObserver;
-#endif
nsCOMPtr<nsIRequest> mRequest;
GaleonEmbedPersist *mGaleonPersist;
Modified: trunk/mozilla/mozilla-embed-shell.cpp
==============================================================================
--- trunk/mozilla/mozilla-embed-shell.cpp (original)
+++ trunk/mozilla/mozilla-embed-shell.cpp Fri Jul 4 20:13:58 2008
@@ -83,9 +83,6 @@
//For setting the locale. hopefully gtkmozembed will do itself soon
#include <nsIChromeRegistry.h>
#include <nsILocaleService.h>
-#ifdef HAVE_NSICHROMEREGISTRYSEA_H
-# include <nsIChromeRegistrySea.h>
-#endif
#ifdef HAVE_NSITOOLKITCHROMEREGISTRY_H
#include "EphyDirectoryProvider.h"
@@ -309,68 +306,6 @@
return TRUE;
}
-#if HAVE_NSICHROMEREGISTRYSEA_H || HAVE_NSIXULCHROMEREGISTRY_SELECTLOCALE
-static nsresult
-getUILang(nsAString& aUILang)
-{
- nsresult result;
- // get a locale service
- nsCOMPtr<nsILocaleService> localeService = do_GetService(NS_LOCALESERVICE_CONTRACTID, &result);
-
- if (NS_FAILED (result) || !localeService)
- {
- g_warning ("Could not get locale service!\n");
- return NS_ERROR_FAILURE;
- }
-
- result = localeService->GetLocaleComponentForUserAgent (aUILang);
- if (NS_FAILED (result))
- {
- g_warning ("Could not determine locale!\n");
- return result;
- }
-
- return NS_OK;
-}
-
-// update global locale if possible (in case when user-*.rdf can be updated)
-// so that any apps after this can be invoked in the UILocale and contentLocale
-static gboolean
-mozilla_init_chrome (void)
-{
- nsresult rv = NS_OK;
- GulString uiLang;
- // compute lang code
- rv = getUILang(uiLang);
- if (NS_FAILED (rv)) return FALSE;
-
-#ifdef HAVE_NSICHROMEREGISTRYSEA_H
- nsCOMPtr<nsIChromeRegistrySea> chromeRegistry = do_GetService(NS_CHROMEREGISTRY_CONTRACTID, &rv);
-#else
-
- nsCOMPtr<nsIXULChromeRegistry> chromeRegistry = do_GetService(NS_CHROMEREGISTRY_CONTRACTID, &rv);
-#endif
- if (NS_FAILED (rv) || !chromeRegistry)
- {
- g_warning ("Could not get the chrome registry!\n");
- return FALSE;
- }
-
- // set locale
- chromeRegistry->SetRuntimeProvider(PR_TRUE);
-
- // Dont worry if this fails, it is probably because the lang pack
- // isn't installed.
- chromeRegistry->SelectLocale (GulCString (uiLang), PR_FALSE);
-
- // Make sure skin is classic so we get native scrollbars
- rv = chromeRegistry->SelectSkin (NS_LITERAL_CSTRING("classic/1.0"), PR_FALSE);
- if (NS_FAILED (rv)) return FALSE;
-
- return TRUE;
-}
-#endif
-
static void
mozilla_embed_shell_init (MozillaEmbedShell *mes)
{
@@ -446,12 +381,6 @@
gboolean ret;
MozillaEmbedShell *mes = MOZILLA_EMBED_SHELL(ges);
- /* Until gtkmozembed does this itself */
-#if HAVE_NSICHROMEREGISTRYSEA_H || HAVE_NSIXULCHROMEREGISTRY_SELECTLOCALE
- ret = mozilla_init_chrome();
- if (ret == FALSE) return FALSE;
-#endif
-
/* Post initialization */
ret = mozilla_set_default_prefs ();
if (ret == FALSE) return FALSE;
Modified: trunk/mozilla/mozilla-notifiers.cpp
==============================================================================
--- trunk/mozilla/mozilla-notifiers.cpp (original)
+++ trunk/mozilla/mozilla-notifiers.cpp Fri Jul 4 20:13:58 2008
@@ -139,11 +139,7 @@
{
{ CONF_FILTERING_JAVA_ENABLED, BOOL_PREF, "security.enable_java"},
{ CONF_FILTERING_JAVASCRIPT_ENABLED, BOOL_PREF, "javascript.enabled"},
-#ifdef HAVE_NEW_IMAGE_PERMISSION_NAME
{ CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "permissions.default.image"},
-#else
- { CONF_FILTERING_IMAGE_LOADING_TYPE, INT_PREF, "network.image.imageBehavior"},
-#endif
{ CONF_RENDERING_BG_COLOR, STRING_PREF, "browser.display.background_color"},
{ CONF_RENDERING_TEXT_COLOR, STRING_PREF, "browser.display.foreground_color"},
{ CONF_RENDERING_UNVISITED_LINKS, STRING_PREF, "browser.anchor_color"},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
