diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-15 09:20:55 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-21 09:58:47 +0800 |
| commit | ed1fa2f3804d189303cb0b0596d4f843d78c6eb3 (patch) | |
| tree | 235d84075a29c0ce331ef50dccd58def9bff1f99 /mail | |
| parent | bf16cd18b646b018a005b9d1d5b72deaeede8d27 (diff) | |
| download | gsoc2013-evolution-ed1fa2f3804d189303cb0b0596d4f843d78c6eb3.tar gsoc2013-evolution-ed1fa2f3804d189303cb0b0596d4f843d78c6eb3.tar.gz gsoc2013-evolution-ed1fa2f3804d189303cb0b0596d4f843d78c6eb3.tar.bz2 gsoc2013-evolution-ed1fa2f3804d189303cb0b0596d4f843d78c6eb3.tar.lz gsoc2013-evolution-ed1fa2f3804d189303cb0b0596d4f843d78c6eb3.tar.xz gsoc2013-evolution-ed1fa2f3804d189303cb0b0596d4f843d78c6eb3.tar.zst gsoc2013-evolution-ed1fa2f3804d189303cb0b0596d4f843d78c6eb3.zip | |
Bug 458491 – Remove useless "Call To..." popup menu option
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-folder-view.c | 1 | ||||
| -rw-r--r-- | mail/em-popup.c | 5 | ||||
| -rw-r--r-- | mail/em-popup.h | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 01c2d3dcdf..6b9d0b540e 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -758,7 +758,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 914b9840b5..4e15a2552d 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -257,10 +257,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; @@ -407,7 +403,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 }; /** |