From 6a6db353ca01d693c363c249903e63546f48e837 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Mon, 14 Jun 2004 13:12:26 +0000 Subject: Get rid of EmbedReloadFlags, and use a gboolean force parameter in 2004-06-14 Christian Persch * embed/ephy-embed.c: (ephy_embed_reload): * embed/ephy-embed.h: * embed/mozilla/mozilla-embed.cpp: * src/prefs-dialog.c: * src/window-commands.c: (window_cmd_view_reload): Get rid of EmbedReloadFlags, and use a gboolean force parameter in ephy_embed_reload() instead, since we only had two states anyway - EMBED_RELOAD_NORMAL, and EMBED_RELOAD_FORCE. --- embed/ephy-embed.c | 10 +++++----- embed/ephy-embed.h | 10 ++-------- embed/mozilla/mozilla-embed.cpp | 4 ++-- 3 files changed, 9 insertions(+), 15 deletions(-) (limited to 'embed') diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index f3fa3bc57..341c66d49 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -476,19 +476,19 @@ ephy_embed_get_js_status (EphyEmbed *embed) /** * ephy_embed_reload: * @embed: an #EphyEmbed - * @flags: %EMBED_RELOAD_FORCE to bypass cache + * @force: %TRUE to bypass cache * * Reloads the web page being displayed in @embed. * - * If @flags is %EMBED_RELOAD_FORCE, cache and proxy will be bypassed when - * reloading the page. Otherwise, use %EMBED_RELOAD_NORMAL. + * If @force is %TRUE, cache and proxy will be bypassed when + * reloading the page. **/ void ephy_embed_reload (EphyEmbed *embed, - EmbedReloadFlags flags) + gboolean force) { EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); - iface->reload (embed, flags); + iface->reload (embed, force); } /** diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h index e55152272..259d94ddf 100644 --- a/embed/ephy-embed.h +++ b/embed/ephy-embed.h @@ -70,12 +70,6 @@ typedef enum EPHY_EMBED_CHROME_STATUSBAR | \ EPHY_EMBED_CHROME_BOOKMARKSBAR) -typedef enum -{ - EMBED_RELOAD_NORMAL = 1 << 0, - EMBED_RELOAD_FORCE = 1 << 1 -} EmbedReloadFlags; - typedef struct { gboolean print_to_file; @@ -179,7 +173,7 @@ struct _EphyEmbedIface const char *url); void (* stop_load) (EphyEmbed *embed); void (* reload) (EphyEmbed *embed, - EmbedReloadFlags flags); + gboolean force); gboolean (* can_go_back) (EphyEmbed *embed); gboolean (* can_go_forward) (EphyEmbed *embed); gboolean (* can_go_up) (EphyEmbed *embed); @@ -240,7 +234,7 @@ void ephy_embed_load_url (EphyEmbed *embed, void ephy_embed_stop_load (EphyEmbed *embed); void ephy_embed_reload (EphyEmbed *embed, - EmbedReloadFlags flags); + gboolean force); char *ephy_embed_get_title (EphyEmbed *embed); diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index 3f12f8e5e..1f4f826c1 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -507,13 +507,13 @@ impl_get_location (EphyEmbed *embed, static void impl_reload (EphyEmbed *embed, - EmbedReloadFlags flags) + gboolean force) { guint32 mflags; mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL; - if (flags & EMBED_RELOAD_FORCE) + if (force) { mflags = GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXYANDCACHE; } -- cgit