[epiphany] Remove mailto: specific menus



commit 7cdfd66e04647967f8c92fa1aa3d75fb489fd475
Author: Xan Lopez <xan igalia com>
Date:   Sun Jan 22 13:04:24 2012 +0100

    Remove mailto: specific menus
    
    They have been dead/#if zeroed for a long time without any bugs opened
    about it, so I can guess they were not used a lot in their day.

 data/ui/epiphany-ui.xml |   14 --------------
 src/ephy-window.c       |   34 ----------------------------------
 src/popup-commands.c    |    9 ---------
 3 files changed, 0 insertions(+), 57 deletions(-)
---
diff --git a/data/ui/epiphany-ui.xml b/data/ui/epiphany-ui.xml
index 1d22837..9f7b9b3 100644
--- a/data/ui/epiphany-ui.xml
+++ b/data/ui/epiphany-ui.xml
@@ -60,20 +60,6 @@
 		<menuitem name="InspectElementLP" action="InspectElement"/>
 	</popup>
 
-	<popup name="EphyEmailLinkPopup" action="PopupAction">
-		<menuitem name="SendEmailItem" action="SendEmail"/>
-		<menuitem name="CopyEmailAddressItem" action="CopyEmailAddress"/>
-		<separator name="ELPSep0"/>
-		<menuitem name="EditCopyELP" action="EditCopy"/>
-		<separator />
-		<menuitem name="OpenImageELP" action="OpenImage"/>
-		<menuitem name="SaveImageAsELP" action="SaveImageAs"/>
-		<menuitem name="SetImageAsBackgroundELP" action="SetImageAsBackground"/>
-		<menuitem name="CopyImageLocationELP" action="CopyImageLocation"/>
-		<separator />
-		<menuitem name="InspectElementELP" action="InspectElement"/>
-	</popup>
-
 	<popup name="EphyNotebookPopup" action="NotebookPopupAction">
 		<placeholder name="TabsMoveGroupENP" position="top">
 			<menuitem name="TabMoveLeftENP" action="TabsMoveLeft"/>
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 9d98313..a37055b 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -265,14 +265,6 @@ static const GtkActionEntry ephy_popups_entries [] = {
 	{ "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL,
 	  NULL, G_CALLBACK (popup_cmd_copy_link_address) },
 
-	/* Email links. */
-
-	/* This is on the context menu on a mailto: link and opens the mail program */
-	{ "SendEmail", STOCK_NEW_MAIL, N_("_Send Emailâ"),
-	  NULL, NULL, G_CALLBACK (popup_cmd_open_link) },
-	{ "CopyEmailAddress", NULL, N_("_Copy Email Address"), NULL,
-	  NULL, G_CALLBACK (popup_cmd_copy_link_address) },
-
 	/* Images. */
 
 	{ "OpenImage", NULL, N_("Open _Image"), NULL,
@@ -2090,25 +2082,6 @@ update_popups_tooltips (EphyWindow *window, GdkEventButton *event, WebKitHitTest
 		g_free (name);
 	}
 
-#if 0
-	if (context & EPHY_EMBED_CONTEXT_EMAIL_LINK)
-	{
-		value = ephy_embed_event_get_property (event, "link");
-
-		action = gtk_action_group_get_action (group, "SendEmail");
-		tooltip = g_strdup_printf (_("Send email to address â%sâ"),
-					   g_value_get_string (value));
-		g_object_set (action, "tooltip", tooltip, NULL);
-		g_free (tooltip);
-
-		action = gtk_action_group_get_action (group, "CopyEmailAddress");
-		tooltip = g_strdup_printf (_("Copy email address â%sâ"),
-					   g_value_get_string (value));
-		g_object_set (action, "tooltip", tooltip, NULL);
-		g_free (tooltip);
-	}
-#endif
-
 	if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
 	{
 		char *uri;
@@ -2164,13 +2137,6 @@ show_embed_popup (EphyWindow *window,
 
 	LOG ("show_embed_popup context %x", context);
 
-#if 0
-	if (context & EPHY_EMBED_CONTEXT_EMAIL_LINK)
-	{
-		popup = "/EphyEmailLinkPopup";
-		update_edit_actions_sensitivity (window, TRUE);
-	}
-#endif
 	if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
 	{
 		popup = "/EphyLinkPopup";
diff --git a/src/popup-commands.c b/src/popup-commands.c
index fd32355..bc57f23 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -164,15 +164,6 @@ popup_cmd_copy_link_address (GtkAction *action,
 
 	context = ephy_embed_event_get_context (event);
 
-#if 0
-	if (context & EPHY_EMBED_CONTEXT_EMAIL_LINK)
-	{
-		value = ephy_embed_event_get_property (event, "email");
-		address = g_value_get_string (&value);
-		popup_cmd_copy_to_clipboard (window, address);
-	}
-#endif
-
 	if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
 	{
 		ephy_embed_event_get_property (event, "link-uri", &value);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]