aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-01-23 07:17:35 +0800
committerChristian Persch <chpe@src.gnome.org>2004-01-23 07:17:35 +0800
commit200d54ac01a9d4af824f9856c8a90daa786c1c2b (patch)
tree76ec4878be4bb28f5e3b9baf9ce35e63c2e917fa
parentbe37cf95beca847cc73733ef90569e5e50a6fafa (diff)
downloadgsoc2013-epiphany-200d54ac01a9d4af824f9856c8a90daa786c1c2b.tar
gsoc2013-epiphany-200d54ac01a9d4af824f9856c8a90daa786c1c2b.tar.gz
gsoc2013-epiphany-200d54ac01a9d4af824f9856c8a90daa786c1c2b.tar.bz2
gsoc2013-epiphany-200d54ac01a9d4af824f9856c8a90daa786c1c2b.tar.lz
gsoc2013-epiphany-200d54ac01a9d4af824f9856c8a90daa786c1c2b.tar.xz
gsoc2013-epiphany-200d54ac01a9d4af824f9856c8a90daa786c1c2b.tar.zst
gsoc2013-epiphany-200d54ac01a9d4af824f9856c8a90daa786c1c2b.zip
Use both BYPASS_CACHE and BYPASS_PROXY on force-reload. Unified the
2004-01-23 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed.h: * embed/mozilla/mozilla-embed.cpp: * src/window-commands.c: (window_cmd_view_reload): Use both BYPASS_CACHE and BYPASS_PROXY on force-reload. Unified the handling in mozilla-embed by introducing EMBED_RELOAD_FORCE, and killed EMBED_RELOAD_BYPASS_[CACHE|PROXY] since we now always use both together.
-rw-r--r--ChangeLog11
-rw-r--r--embed/ephy-embed.h5
-rw-r--r--embed/mozilla/mozilla-embed.cpp13
-rw-r--r--src/window-commands.c2
4 files changed, 16 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b242f8fc..086b5cc5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-23 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/ephy-embed.h:
+ * embed/mozilla/mozilla-embed.cpp:
+ * src/window-commands.c: (window_cmd_view_reload):
+
+ Use both BYPASS_CACHE and BYPASS_PROXY on force-reload.
+ Unified the handling in mozilla-embed by introducing
+ EMBED_RELOAD_FORCE, and killed EMBED_RELOAD_BYPASS_[CACHE|PROXY]
+ since we now always use both together.
+
2004-01-22 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-encodings.c:
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index 71ca925d8..e41e9f5e6 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -75,9 +75,8 @@ typedef enum
typedef enum
{
- EMBED_RELOAD_NORMAL = 1 << 1,
- EMBED_RELOAD_BYPASSCACHE = 1 << 2,
- EMBED_RELOAD_BYPASSPROXY = 1 << 3
+ EMBED_RELOAD_NORMAL = 1 << 0,
+ EMBED_RELOAD_FORCE = 1 << 1
} EmbedReloadFlags;
typedef struct
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 421d0c194..c0432b1f9 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -506,20 +506,11 @@ impl_reload (EphyEmbed *embed,
guint32 mflags;
mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL;
-
- if ((flags & EMBED_RELOAD_BYPASSCACHE) &&
- (flags & EMBED_RELOAD_BYPASSPROXY))
+
+ if (flags & EMBED_RELOAD_FORCE)
{
mflags = GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXYANDCACHE;
}
- else if (flags & EMBED_RELOAD_BYPASSCACHE)
- {
- mflags = GTK_MOZ_EMBED_FLAG_RELOADBYPASSCACHE;
- }
- else if (flags & EMBED_RELOAD_BYPASSPROXY)
- {
- mflags = GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXY;
- }
gtk_moz_embed_reload (GTK_MOZ_EMBED(embed),
mflags);
diff --git a/src/window-commands.c b/src/window-commands.c
index 6c1191baf..06b88cd2f 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -270,7 +270,7 @@ window_cmd_view_reload (GtkAction *action,
ephy_embed_activate (embed);
ephy_embed_reload (embed, force ? EMBED_RELOAD_NORMAL
- : EMBED_RELOAD_BYPASSCACHE);
+ : EMBED_RELOAD_FORCE);
}
void