aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2007-12-23 02:26:10 +0800
committerXan Lopez <xan@src.gnome.org>2007-12-23 02:26:10 +0800
commitf80bb17f45f986594db9cbfdfb5c4af070c7fa5e (patch)
tree7cc8f311423501640e0e2240ca60f86ba25623d4
parent3a7d27a4a1e80c7beadebd36905363dc9488fe9d (diff)
downloadgsoc2013-epiphany-f80bb17f45f986594db9cbfdfb5c4af070c7fa5e.tar
gsoc2013-epiphany-f80bb17f45f986594db9cbfdfb5c4af070c7fa5e.tar.gz
gsoc2013-epiphany-f80bb17f45f986594db9cbfdfb5c4af070c7fa5e.tar.bz2
gsoc2013-epiphany-f80bb17f45f986594db9cbfdfb5c4af070c7fa5e.tar.lz
gsoc2013-epiphany-f80bb17f45f986594db9cbfdfb5c4af070c7fa5e.tar.xz
gsoc2013-epiphany-f80bb17f45f986594db9cbfdfb5c4af070c7fa5e.tar.zst
gsoc2013-epiphany-f80bb17f45f986594db9cbfdfb5c4af070c7fa5e.zip
Also fix parent instance/class for MozillaEmbed.
svn path=/trunk/; revision=7797
-rw-r--r--embed/mozilla/mozilla-embed.cpp1
-rw-r--r--embed/mozilla/mozilla-embed.h5
2 files changed, 3 insertions, 3 deletions
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 96fa06c9c..40cc20ff9 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -39,7 +39,6 @@
#include "EphyUtils.h"
#include "EventContext.h"
-#include "ephy-base-embed.h"
#include "ephy-command-manager.h"
#include "ephy-debug.h"
#include "ephy-embed-container.h"
diff --git a/embed/mozilla/mozilla-embed.h b/embed/mozilla/mozilla-embed.h
index 817d950f7..21ddaf466 100644
--- a/embed/mozilla/mozilla-embed.h
+++ b/embed/mozilla/mozilla-embed.h
@@ -27,6 +27,7 @@
#include <gtkmozembed.h>
#include "ephy-embed.h"
+#include "ephy-base-embed.h"
G_BEGIN_DECLS
@@ -43,7 +44,7 @@ typedef struct MozillaEmbedPrivate MozillaEmbedPrivate;
struct MozillaEmbed
{
- GtkMozEmbed parent;
+ EphyBaseEmbed parent_instance;
/*< private >*/
MozillaEmbedPrivate *priv;
@@ -51,7 +52,7 @@ struct MozillaEmbed
struct MozillaEmbedClass
{
- GtkMozEmbedClass parent_class;
+ EphyBaseEmbedClass parent_class;
};
GType mozilla_embed_get_type (void);