aboutsummaryrefslogtreecommitdiffstats
path: root/embed/mozilla
diff options
context:
space:
mode:
Diffstat (limited to 'embed/mozilla')
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp2
-rw-r--r--embed/mozilla/mozilla-embed.cpp12
-rw-r--r--embed/mozilla/mozilla-embed.h2
3 files changed, 5 insertions, 11 deletions
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 5668e14fb..4677613ea 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -204,7 +204,7 @@ impl_save (EphyEmbedPersist *persist)
if (embed)
{
- wrapper = (EphyWrapper *) mozilla_embed_get_galeon_wrapper (MOZILLA_EMBED(embed));
+ wrapper = (EphyWrapper *) mozilla_embed_get_ephy_wrapper (MOZILLA_EMBED(embed));
g_return_val_if_fail (wrapper != NULL, G_FAILED);
wrapper->GetDOMWindow (getter_AddRefs (parent));
}
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index af9e9c3ad..c65f50a34 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -356,8 +356,10 @@ mozilla_embed_init (MozillaEmbed *embed)
}
gpointer
-mozilla_embed_get_galeon_wrapper (MozillaEmbed *embed)
+mozilla_embed_get_ephy_wrapper (MozillaEmbed *embed)
{
+ g_return_val_if_fail (embed->priv->wrapper != NULL, NULL);
+
return embed->priv->wrapper;
}
@@ -422,14 +424,6 @@ mozilla_embed_finalize (GObject *object)
LOG ("MozillaEmbed finalized %p", embed)
}
-gpointer
-mozilla_embed_get_ephy_wrapper (MozillaEmbed *embed)
-{
- g_return_val_if_fail (embed->priv->wrapper != NULL, NULL);
-
- return embed->priv->wrapper;
-}
-
static void
impl_get_capabilities (EphyEmbed *embed,
EmbedCapabilities *caps)
diff --git a/embed/mozilla/mozilla-embed.h b/embed/mozilla/mozilla-embed.h
index b8ebca4c8..cbe34d018 100644
--- a/embed/mozilla/mozilla-embed.h
+++ b/embed/mozilla/mozilla-embed.h
@@ -54,7 +54,7 @@ struct MozillaEmbedClass
GType mozilla_embed_get_type (void);
-gpointer mozilla_embed_get_galeon_wrapper (MozillaEmbed *embed);
+gpointer mozilla_embed_get_ephy_wrapper (MozillaEmbed *embed);
G_END_DECLS