From 17c25e5bdfa617b67ac3a40f4d7a43f70cb8e91f Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw44@gmail.com>
Date: Sun, 15 Sep 2013 18:22:23 +0800
Subject: Archive creating can be cancelled

---
 src/ephy-window.c             |  4 ++++
 src/resources/epiphany-ui.xml |  1 +
 src/window-commands.c         | 15 +++++++++++++++
 src/window-commands.h         |  2 ++
 4 files changed, 22 insertions(+)

(limited to 'src')

diff --git a/src/ephy-window.c b/src/ephy-window.c
index bec411398..c05734ab8 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -168,6 +168,8 @@ static const GtkActionEntry ephy_menu_entries [] = {
 	{ "ViewEncoding", NULL, N_("Text _Encoding"), NULL, NULL, NULL },
 	{ "ViewPageSource", NULL, N_("_Page Source"), "<control>U", NULL,
 	  G_CALLBACK (window_cmd_view_page_source) },
+	{ "ViewStopArchiving", NULL, N_("Stop _Archiving"), NULL, NULL,
+	  G_CALLBACK (window_cmd_view_stop_archiving) },
 
 	/* Bookmarks actions. */
 
@@ -1994,6 +1996,8 @@ 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,
+					    priv->action_group, "ViewStopArchiving");
 		webkit_context_menu_append (context_menu,
 					    webkit_context_menu_item_new_separator ());
 		add_action_to_context_menu (context_menu,
diff --git a/src/resources/epiphany-ui.xml b/src/resources/epiphany-ui.xml
index 976dddce4..14906bcd3 100644
--- a/src/resources/epiphany-ui.xml
+++ b/src/resources/epiphany-ui.xml
@@ -23,6 +23,7 @@
 		<menuitem name="GoBackDP" action="NavigationBack"/>
 		<menuitem name="GoForwardDP" action="NavigationForward"/>
 		<menuitem name="GoReloadDP" action="ViewReload"/>
+		<menuitem name="StopArchivingDP" action="ViewStopArchiving"/>
 		<separator />
 		<menuitem name="EditCopyDP" action="EditCopy"/>
 		<separator />
diff --git a/src/window-commands.c b/src/window-commands.c
index 9f61c27e4..d3cf07fe1 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -1659,6 +1659,21 @@ window_cmd_view_page_source (GtkAction *action,
 	}
 }
 
+void
+window_cmd_view_stop_archiving (GtkAction *action,
+				EphyWindow *window)
+{
+	EphyEmbed *embed;
+	EphyWebView *view;
+
+	embed = ephy_embed_container_get_active_child
+          (EPHY_EMBED_CONTAINER (window));
+	g_return_if_fail (EPHY_IS_EMBED (embed));
+	view = ephy_embed_get_web_view (embed);
+
+	ephy_web_view_cancel_archiving (view);
+}
+
 #define ABOUT_GROUP "About"
 
 void
diff --git a/src/window-commands.h b/src/window-commands.h
index abf5865d6..885c4034b 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -84,6 +84,8 @@ void window_cmd_view_zoom_normal          (GtkAction  *action,
                                            EphyWindow *window);
 void window_cmd_view_page_source          (GtkAction  *action,
                                            EphyWindow *window);
+void window_cmd_view_stop_archiving       (GtkAction  *action,
+                                           EphyWindow *window);
 void window_cmd_help_about                (GtkAction  *action,
                                            GtkWidget  *window);
 void window_cmd_tabs_next                 (GtkAction  *action,
-- 
cgit v1.2.3