diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSClientAuthDialogs.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSDialogs.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSKeyPairDialogs.cpp | 4 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 16 |
6 files changed, 24 insertions, 20 deletions
@@ -1,5 +1,15 @@ 2004-11-19 Christian Persch <chpe@cvs.gnome.org> + * configure.ac: + * embed/mozilla/GtkNSSClientAuthDialogs.cpp: + * embed/mozilla/GtkNSSDialogs.cpp: + * embed/mozilla/GtkNSSKeyPairDialogs.cpp: + * embed/mozilla/Makefile.am: + + Only build those files when we have mozilla psm. + +2004-11-19 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/EphyBrowser.cpp: Use the dom window from the event. diff --git a/configure.ac b/configure.ac index 1a4fd85c6..a489613af 100644 --- a/configure.ac +++ b/configure.ac @@ -378,8 +378,10 @@ CXXFLAGS=$_SAVE_CXXFLAGS AC_LANG_POP(C++) AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/pipnss/nsIX509Cert.h], - [AC_DEFINE(HAVE_MOZILLA_PSM, 1, - [Define if you have the mozilla psm headers installed])]) + [AC_DEFINE([HAVE_MOZILLA_PSM],[1], + [Define if you have the mozilla psm headers installed]) have_psm=yes], + [have_psm=no]) +AM_CONDITIONAL([HAVE_MOZILLA_PSM],[test "x$have_psm" = "xyes"]) if test "x$flavour" = "xmozilla"; then AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPassword.h], diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp index cd1ee2fb9..d8f68c883 100644 --- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp +++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp @@ -24,8 +24,6 @@ #include "config.h" -#ifdef HAVE_MOZILLA_PSM - #include "EphyUtils.h" #include <nsIServiceManager.h> @@ -284,5 +282,3 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx, gtk_widget_destroy (dialog); return NS_OK; } - -#endif diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp index c245a082d..52a2e351a 100644 --- a/embed/mozilla/GtkNSSDialogs.cpp +++ b/embed/mozilla/GtkNSSDialogs.cpp @@ -30,8 +30,6 @@ #include "config.h" -#ifdef HAVE_MOZILLA_PSM - #include "EphyUtils.h" #include <nsCOMPtr.h> @@ -1465,5 +1463,3 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx, gtk_widget_destroy (dialog); return NS_OK; } - -#endif diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index 90a1d958f..4670abd06 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -39,8 +39,6 @@ #include "config.h" -#ifdef HAVE_MOZILLA_PSM - #include "EphyUtils.h" #include <nsIServiceManager.h> @@ -711,5 +709,3 @@ NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aWindowRoo { MOZ_NOT_IMPLEMENTED } - -#endif diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index 029956db0..ec3913a64 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -66,12 +66,6 @@ libephymozillaembed_la_SOURCES = \ EventContext.h \ GlobalHistory.cpp \ GlobalHistory.h \ - GtkNSSClientAuthDialogs.cpp \ - GtkNSSClientAuthDialogs.h \ - GtkNSSDialogs.cpp \ - GtkNSSDialogs.h \ - GtkNSSKeyPairDialogs.cpp \ - GtkNSSKeyPairDialogs.h \ MozDownload.cpp \ MozDownload.h \ MozillaPrivate.cpp \ @@ -98,3 +92,13 @@ libephymozillaembed_la_SOURCES += \ FilePicker.cpp \ FilePicker.h endif + +if HAVE_MOZILLA_PSM +libephymozillaembed_la_SOURCES += \ + GtkNSSClientAuthDialogs.cpp \ + GtkNSSClientAuthDialogs.h \ + GtkNSSDialogs.cpp \ + GtkNSSDialogs.h \ + GtkNSSKeyPairDialogs.cpp \ + GtkNSSKeyPairDialogs.h +endif |