From ea3e4f239a529716452159d5deac20cd9a38c832 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 14 May 2009 21:20:55 -0400
Subject: =?UTF-8?q?Bug=20458491=20=E2=80=93=20Remove=20useless=20"Call=20T?=
 =?UTF-8?q?o..."=20popup=20menu=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mail/em-folder-view.c | 1 -
 mail/em-popup.c       | 5 -----
 mail/em-popup.h       | 4 +---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 8e220955fa..2fa04b5990 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -2752,7 +2752,6 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem emfv_uri_popups[] = {
-	{ E_POPUP_ITEM, "00.uri.11", N_("C_all To..."), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_CALLTO },
 	{ E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "edit-copy", EM_POPUP_URI_NOT_MAILTO },
 
 	{ E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO },
diff --git a/mail/em-popup.c b/mail/em-popup.c
index debad8cb56..192ab7ac7b 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -261,10 +261,6 @@ em_popup_target_new_uri(EMPopup *emp, const char *uri)
 	if (g_ascii_strncasecmp(uri, "http:", 5) == 0
 	    || g_ascii_strncasecmp(uri, "https:", 6) == 0)
 		mask &= ~EM_POPUP_URI_HTTP;
-	else if (g_ascii_strncasecmp(uri, "sip:", 3) == 0
-	    || g_ascii_strncasecmp(uri, "h323:", 5) == 0
-	    || g_ascii_strncasecmp(uri, "callto:", 7) == 0)
-		mask &= ~EM_POPUP_URI_CALLTO;
 
 	if (g_ascii_strncasecmp(uri, "mailto:", 7) == 0)
 		mask &= ~EM_POPUP_URI_MAILTO;
@@ -824,7 +820,6 @@ static const EPopupHookTargetMask emph_uri_masks[] = {
 	{ "http", EM_POPUP_URI_HTTP },
 	{ "mailto", EM_POPUP_URI_MAILTO },
 	{ "notmailto", EM_POPUP_URI_NOT_MAILTO },
-	{ "callto", EM_POPUP_URI_CALLTO },
 	{ NULL }
 };
 
diff --git a/mail/em-popup.h b/mail/em-popup.h
index 77f80e5599..8df98a6488 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -113,14 +113,12 @@ enum _em_popup_target_select_t {
  * @EM_POPUP_URI_HTTP: This is a HTTP or HTTPS url.
  * @EM_POPUP_URI_MAILTO: This is a MAILTO url.
  * @EM_POPUP_URI_NOT_MAILTO: This is not a MAILTO url.
- * @EM_POPUP_URI_CALLTO: This is a CALLTO url.
  *
  **/
 enum _em_popup_target_uri_t {
 	EM_POPUP_URI_HTTP = 1<<0,
 	EM_POPUP_URI_MAILTO = 1<<1,
-	EM_POPUP_URI_NOT_MAILTO = 1<<2,
-	EM_POPUP_URI_CALLTO = 1<<3,
+	EM_POPUP_URI_NOT_MAILTO = 1<<2
 };
 
 /**
-- 
cgit v1.2.3