aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-02-28 22:17:11 +0800
committerChristian Persch <chpe@src.gnome.org>2008-02-28 22:17:11 +0800
commit04dd082a20d83a015cf999ad4cb27aca752c5e80 (patch)
treeace513f6c87cd411118e22e3f25cd9db94bf0f9e
parented8b102cd57527cd90f4f9d0c5bf5425a7c5938c (diff)
downloadgsoc2013-epiphany-04dd082a20d83a015cf999ad4cb27aca752c5e80.tar
gsoc2013-epiphany-04dd082a20d83a015cf999ad4cb27aca752c5e80.tar.gz
gsoc2013-epiphany-04dd082a20d83a015cf999ad4cb27aca752c5e80.tar.bz2
gsoc2013-epiphany-04dd082a20d83a015cf999ad4cb27aca752c5e80.tar.lz
gsoc2013-epiphany-04dd082a20d83a015cf999ad4cb27aca752c5e80.tar.xz
gsoc2013-epiphany-04dd082a20d83a015cf999ad4cb27aca752c5e80.tar.zst
gsoc2013-epiphany-04dd082a20d83a015cf999ad4cb27aca752c5e80.zip
Fix AutoModalDialog::ShouldShow(). Bug #519173.
svn path=/trunk/; revision=7999
-rw-r--r--embed/mozilla/AutoModalDialog.h6
-rw-r--r--embed/mozilla/GtkNSSDialogs.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/embed/mozilla/AutoModalDialog.h b/embed/mozilla/AutoModalDialog.h
index 91bb71007..f20a22149 100644
--- a/embed/mozilla/AutoModalDialog.h
+++ b/embed/mozilla/AutoModalDialog.h
@@ -60,11 +60,11 @@ class AutoModalDialog
PRBool DispatchEvent (const char*, PRBool);
int mResponse;
- PRPackedBool mContinueModalLoop;
+ PRBool mContinueModalLoop;
#endif
- PRPackedBool mDefaultEnabled;
- PRPackedBool mContextPushed;
+ PRBool mDefaultEnabled;
+ PRBool mContextPushed;
};
#endif
diff --git a/embed/mozilla/GtkNSSDialogs.h b/embed/mozilla/GtkNSSDialogs.h
index 467cb3ff4..91e89f370 100644
--- a/embed/mozilla/GtkNSSDialogs.h
+++ b/embed/mozilla/GtkNSSDialogs.h
@@ -22,9 +22,7 @@
#ifndef GTKNSSDIALOGS_H
#define GTKNSSDIALOGS_H 1
-#ifdef HAVE_GECKO_1_9
-#include <nsIBadCertListener2.h>
-#else
+#ifndef HAVE_GECKO_1_9
#include <nsIBadCertListener.h>
#endif
#include <nsICertificateDialogs.h>