diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | embed/ephy-embed.c | 10 | ||||
| -rw-r--r-- | embed/ephy-embed.h | 10 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 4 | ||||
| -rw-r--r-- | src/prefs-dialog.c | 2 | ||||
| -rw-r--r-- | src/window-commands.c | 3 |
6 files changed, 22 insertions, 19 deletions
@@ -1,3 +1,15 @@ +2004-06-14 Christian Persch <chpe@cvs.gnome.org> + + * 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. + 2004-06-13 Marco Pesenti Gritti <marco@gnome.org> * configure.in: 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; } diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 161c5663b..1f14b3c8c 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -63,8 +63,6 @@ static void prefs_dialog_class_init (PrefsDialogClass *klass); static void prefs_dialog_init (PrefsDialog *pd); /* Glade callbacks */ -void prefs_proxy_auto_url_reload_cb (GtkWidget *button, - EphyDialog *dialog); void prefs_clear_cache_button_clicked_cb (GtkWidget *button, gpointer data); void prefs_dialog_response_cb (GtkDialog *widget, diff --git a/src/window-commands.c b/src/window-commands.c index 83d5aeae7..41f0c481b 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -272,8 +272,7 @@ window_cmd_view_reload (GtkAction *action, ephy_embed_activate (embed); - ephy_embed_reload (embed, force ? EMBED_RELOAD_FORCE - : EMBED_RELOAD_NORMAL); + ephy_embed_reload (embed, force); } void |