aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac22
-rw-r--r--embed/mozilla/ContentHandler.cpp17
3 files changed, 43 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d9e24899..49049c86b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-21 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
+ * embed/mozilla/ContentHandler.cpp:
+
+ Oh the joys of mozilla API changes :P
+
2005-03-15 Christian Persch <chpe@cvs.gnome.org>
* data/default-prefs-toolkit.js:
diff --git a/configure.ac b/configure.ac
index 760adc7ae..d823ddd36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -419,6 +419,26 @@ AC_COMPILE_IFELSE(
AC_MSG_RESULT([$result])
+dnl Changed from PRBool to PRUin32 in 1.8b2
+
+AC_MSG_CHECKING([for nsIHelperAppLauncherDialog::Show arguments])
+
+AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE(
+ [[#include <exthandler/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([MOZ_NSIHELPERAPPLAUNCHERDIALOG_UNSIGNED],[1],[Define if nsIHelperAppLauncherDialog::Show takes unsigned integer]) result=unsigned],
+ [result=signed])
+
+AC_MSG_RESULT([$result])
+
dnl exists since 1.8a6
AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsITransfer.h],
@@ -574,6 +594,8 @@ fi
if test "x$have_iso_codes" = "xyes"; then
AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
AC_DEFINE([HAVE_ISO_CODES],[1],[Define if you have the iso-codes package])
+else
+ AC_MSG_ERROR([iso-codes is required])
fi
dnl Translators: new languages must be added to the po/LINGUAS file
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index ef2e07b6b..d590905db 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -93,15 +93,26 @@ GContentHandler::~GContentHandler()
NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog)
+#ifdef MOZ_NSIHELPERAPPLAUNCHERDIALOG_UNSIGNED
+/* void show (in nsIHelperAppLauncher aLauncher, in nsISupports aContext, in unsigned long aReason); */
+NS_IMETHODIMP
+GContentHandler::Show (nsIHelperAppLauncher *aLauncher,
+ nsISupports *aContext,
+ PRUint32 aReason)
+#else
/* void show (in nsIHelperAppLauncher aLauncher, in nsISupports aContext); */
-NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
- nsISupports *aContext,
- PRBool aForced)
+NS_IMETHODIMP
+GContentHandler::Show (nsIHelperAppLauncher *aLauncher,
+ nsISupports *aContext,
+ PRBool aForced)
+#endif
{
nsresult rv;
EphyEmbedSingle *single;
gboolean handled = FALSE;
+ /* FIXME: handle aForced / aReason argument in some way? */
+
mContext = aContext;
mLauncher = aLauncher;
rv = Init ();