aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/EphyBrowser.h8
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp10
-rw-r--r--embed/mozilla/mozilla-embed.cpp3
-rw-r--r--embed/mozilla/mozilla-embed.h10
6 files changed, 25 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index cfbc1d85c..76fc8424a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-08-08 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/EphyBrowser.cpp:
+ * embed/mozilla/EphyBrowser.h:
+
+ Fix compiler warning about anon enum mismatch.
+
+2004-08-08 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/mozilla-embed.cpp:
Allow XUL windows to open new windows.
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 62cf139ed..a26005f21 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -415,7 +415,7 @@ nsresult EphyBrowser::GoToHistoryIndex (PRInt16 index)
/* Workaround for broken reload with frames, see mozilla bug
* http://bugzilla.mozilla.org/show_bug.cgi?id=246392
*/
-nsresult EphyBrowser::Reload (PRUint32 flags)
+nsresult EphyBrowser::Reload (ReloadType flags)
{
NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index 52cb31d50..66e97c9e5 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -113,11 +113,11 @@ public:
nsresult GoToHistoryIndex (PRInt16 index);
#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 3)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
- enum { RELOAD_NORMAL = 0 };
- enum { RELOAD_FORCE = 1 };
- enum { RELOAD_ENCODING_CHANGE = 2 };
+ enum ReloadType { RELOAD_NORMAL = 0,
+ RELOAD_FORCE = 1,
+ RELOAD_ENCODING_CHANGE = 2 };
- nsresult Reload (PRUint32 flags);
+ nsresult Reload (ReloadType flags);
#endif
nsresult ForceEncoding (const char *encoding);
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index b0ffffeb3..66d6f54d1 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -1,6 +1,6 @@
/* vim:set ts=8 noet sw=8:
- * Copyright (C) 2000-2003 Marco Pesenti Gritti
- * Copyright (C) 2003 Christian Persch
+ * Copyright (C) 2000-2004 Marco Pesenti Gritti
+ * Copyright (C) 2003, 2004 Christian Persch
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -307,9 +307,9 @@ mozilla_setup_colors (MozillaEmbedSingle *mes)
static void
mozilla_embed_single_new_window_orphan_cb (GtkMozEmbedSingle *embed,
- GtkMozEmbed **retval,
- guint chrome_mask,
- EphyEmbedSingle *shell)
+ GtkMozEmbed **retval,
+ guint chrome_mask,
+ EphyEmbedSingle *shell)
{
g_assert (chrome_mask & GTK_MOZ_EMBED_FLAG_OPENASCHROME);
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 7d77f1e6c..d31d86af0 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2000-2003 Marco Pesenti Gritti
+ * Copyright (C) 2000-2004 Marco Pesenti Gritti
+ * Copyright (C) 2003, 2004 Christian Persch
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/embed/mozilla/mozilla-embed.h b/embed/mozilla/mozilla-embed.h
index 4eba0dba9..64bb5ccd8 100644
--- a/embed/mozilla/mozilla-embed.h
+++ b/embed/mozilla/mozilla-embed.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2003 Marco Pesenti Gritti
+ * Copyright (C) 2000-2004 Marco Pesenti Gritti
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -37,13 +37,15 @@ G_BEGIN_DECLS
#define MOZILLA_IS_EMBED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MOZILLA_TYPE_EMBED))
#define MOZILLA_EMBED_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MOZILLA_TYPE_EMBED, MozillaEmbedClass))
-typedef struct MozillaEmbedClass MozillaEmbedClass;
-typedef struct MozillaEmbed MozillaEmbed;
-typedef struct MozillaEmbedPrivate MozillaEmbedPrivate;
+typedef struct MozillaEmbedClass MozillaEmbedClass;
+typedef struct MozillaEmbed MozillaEmbed;
+typedef struct MozillaEmbedPrivate MozillaEmbedPrivate;
struct MozillaEmbed
{
GtkMozEmbed parent;
+
+ /*< private >*/
MozillaEmbedPrivate *priv;
};