aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-09-20 04:45:02 +0800
committerChristian Persch <chpe@src.gnome.org>2005-09-20 04:45:02 +0800
commit810d08d92d2cccd07e75ec60a415cc3d15320fcd (patch)
tree6dd2855bdbcb4c760b0ee44cc884120e0f57a69a /embed
parentc595f06b394a165017d0397c8bd3fdecce8b8d9f (diff)
downloadgsoc2013-epiphany-810d08d92d2cccd07e75ec60a415cc3d15320fcd.tar
gsoc2013-epiphany-810d08d92d2cccd07e75ec60a415cc3d15320fcd.tar.gz
gsoc2013-epiphany-810d08d92d2cccd07e75ec60a415cc3d15320fcd.tar.bz2
gsoc2013-epiphany-810d08d92d2cccd07e75ec60a415cc3d15320fcd.tar.lz
gsoc2013-epiphany-810d08d92d2cccd07e75ec60a415cc3d15320fcd.tar.xz
gsoc2013-epiphany-810d08d92d2cccd07e75ec60a415cc3d15320fcd.tar.zst
gsoc2013-epiphany-810d08d92d2cccd07e75ec60a415cc3d15320fcd.zip
Add EPHY_EMBED_STATE_RESTORING and conversion from
2005-09-19 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-embed.h: * embed/mozilla/mozilla-embed.cpp: Add EPHY_EMBED_STATE_RESTORING and conversion from GTK_MOZ_EMBED_FLAG_RESTORING.
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed.h3
-rw-r--r--embed/mozilla/mozilla-embed.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index b83891242..eaac67801 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -51,7 +51,8 @@ typedef enum
EPHY_EMBED_STATE_IS_REQUEST = 1 << 5,
EPHY_EMBED_STATE_IS_DOCUMENT = 1 << 6,
EPHY_EMBED_STATE_IS_NETWORK = 1 << 7,
- EPHY_EMBED_STATE_IS_WINDOW = 1 << 8
+ EPHY_EMBED_STATE_IS_WINDOW = 1 << 8,
+ EPHY_EMBED_STATE_RESTORING = 1 << 9
} EphyEmbedNetState;
typedef enum
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index e692c590e..b0e9ed5ff 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -929,6 +929,9 @@ mozilla_embed_net_state_all_cb (GtkMozEmbed *embed, const char *aURI,
{ GTK_MOZ_EMBED_FLAG_IS_REQUEST, EPHY_EMBED_STATE_IS_REQUEST },
{ GTK_MOZ_EMBED_FLAG_IS_DOCUMENT, EPHY_EMBED_STATE_IS_DOCUMENT },
{ GTK_MOZ_EMBED_FLAG_IS_NETWORK, EPHY_EMBED_STATE_IS_NETWORK },
+#ifdef HAVE_GECKO_1_8
+ { GTK_MOZ_EMBED_FLAG_RESTORING, EPHY_EMBED_STATE_RESTORING },
+#endif
{ 0, EPHY_EMBED_STATE_UNKNOWN }
};