diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | embed/ephy-embed-types.h | 4 | ||||
| -rw-r--r-- | embed/ephy-embed-utils.c | 2 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-persist.cpp | 2 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 12 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.h | 2 |
6 files changed, 28 insertions, 14 deletions
@@ -1,5 +1,25 @@ 2003-04-28 David Bordoley <bordoley@msu.edu> + * embed/ephy-embed-types.h: + s/GALEON/EPIPHANY in the defines. + + * embed/ephy-embed-utils.c: (ephy_embed_utils_save) + s/GaleonEmbedPersist/EphyEmbedPersist in the comment. + + * embed/mozilla/mozilla-embed-persist.cpp: (impl_save): + s/mozilla_embed_get_galeon_wrapper/mozilla_embed_get_ephy_wrapper. + + * embed/mozilla/mozilla-embed.cpp: (mozilla_embed_get_galeon_wrapper), + (mozilla_embed_get_ephy_wrapper): + Remove duplicate function (keep the galeon one, since it was the one + actually being used in the code). + s/galeon/ephy. + + * embed/mozilla/mozilla-embed.h: + s/mozilla_embed_get_galeon_wrapper/mozilla_embed_get_ephy_wrapper. + +2003-04-28 David Bordoley <bordoley@msu.edu> + * data/epiphany.schemas.in: * data/ui/epiphany-bookmark-editor-ui.xml.in: * data/ui/epiphany-toolbar.xml.in: diff --git a/embed/ephy-embed-types.h b/embed/ephy-embed-types.h index 07055433a..1252b30b5 100644 --- a/embed/ephy-embed-types.h +++ b/embed/ephy-embed-types.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef GALEON_EMBED_TYPES_H -#define GALEON_EMBED_TYPES_H +#ifndef EPHY_EMBED_TYPES_H +#define EPHY_EMBED_TYPES_H #include "ephy-types.h" diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c index e564bb084..941069b51 100644 --- a/embed/ephy-embed-utils.c +++ b/embed/ephy-embed-utils.c @@ -37,7 +37,7 @@ * @ask_dest: ask the user the destination path * @ask_content: show the user an option to save the content * of the web page (images, javascript...) - * @persist: the #GaleonEmbedPersist referring to the url + * @persist: the #EphyEmbedPersist referring to the url * * Download a save an url asking a location to the user when requested **/ 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 |