aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing-Wei Lan <lantw44@gmail.com>2013-09-15 20:35:07 +0800
committerLAN-TW <lantw44@gmail.com>2013-09-15 20:35:51 +0800
commitf69c1fa76e874e0dd4210d896174b03c6d250fba (patch)
tree1a9dbf399079d61f510b0472a50d307fb071fd24
parent17c25e5bdfa617b67ac3a40f4d7a43f70cb8e91f (diff)
downloadgsoc2013-epiphany-f69c1fa76e874e0dd4210d896174b03c6d250fba.tar
gsoc2013-epiphany-f69c1fa76e874e0dd4210d896174b03c6d250fba.tar.gz
gsoc2013-epiphany-f69c1fa76e874e0dd4210d896174b03c6d250fba.tar.bz2
gsoc2013-epiphany-f69c1fa76e874e0dd4210d896174b03c6d250fba.tar.lz
gsoc2013-epiphany-f69c1fa76e874e0dd4210d896174b03c6d250fba.tar.xz
gsoc2013-epiphany-f69c1fa76e874e0dd4210d896174b03c6d250fba.tar.zst
gsoc2013-epiphany-f69c1fa76e874e0dd4210d896174b03c6d250fba.zip
Show "Stop Archiving" only when the EphyWebView is archivingHEADarchive-creationarchive-integration
-rw-r--r--embed/ephy-web-view.c2
-rw-r--r--src/ephy-window.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 298a6fc8e..683eb29c0 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -2504,7 +2504,7 @@ ephy_web_view_init (EphyWebView *web_view)
priv = web_view->priv = EPHY_WEB_VIEW_GET_PRIVATE (web_view);
priv->is_blank = TRUE;
- priv->is_archiving = TRUE;
+ priv->is_archiving = FALSE;
priv->title = g_strdup (EMPTY_PAGE);
priv->document_type = EPHY_WEB_VIEW_DOCUMENT_HTML;
priv->security_level = EPHY_WEB_VIEW_STATE_IS_UNKNOWN;
diff --git a/src/ephy-window.c b/src/ephy-window.c
index c05734ab8..57364cd70 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1996,8 +1996,11 @@ populate_context_menu (WebKitWebView *web_view,
priv->toolbar_action_group, "NavigationForward");
add_action_to_context_menu (context_menu,
priv->action_group, "ViewReload");
- add_action_to_context_menu (context_menu,
+
+ if (ephy_web_view_get_is_archiving (EPHY_WEB_VIEW (web_view)))
+ add_action_to_context_menu (context_menu,
priv->action_group, "ViewStopArchiving");
+
webkit_context_menu_append (context_menu,
webkit_context_menu_item_new_separator ());
add_action_to_context_menu (context_menu,