diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-18 13:23:06 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-06-18 13:23:06 +0800 |
| commit | 68b50c270671de5d3e854ff949efcd66f4c2f745 (patch) | |
| tree | 05d563948b0cabe9cd78508fa9a9d199949ad05f /mail/em-popup.c | |
| parent | b977b54e2febcb4cb767dcf5e26a273f86e7b5db (diff) | |
| download | gsoc2013-evolution-68b50c270671de5d3e854ff949efcd66f4c2f745.tar gsoc2013-evolution-68b50c270671de5d3e854ff949efcd66f4c2f745.tar.gz gsoc2013-evolution-68b50c270671de5d3e854ff949efcd66f4c2f745.tar.bz2 gsoc2013-evolution-68b50c270671de5d3e854ff949efcd66f4c2f745.tar.lz gsoc2013-evolution-68b50c270671de5d3e854ff949efcd66f4c2f745.tar.xz gsoc2013-evolution-68b50c270671de5d3e854ff949efcd66f4c2f745.tar.zst gsoc2013-evolution-68b50c270671de5d3e854ff949efcd66f4c2f745.zip | |
** Fix for bug #445812 from Gilles Dartiguelongue
svn path=/trunk/; revision=33699
Diffstat (limited to 'mail/em-popup.c')
| -rw-r--r-- | mail/em-popup.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mail/em-popup.c b/mail/em-popup.c index b059926f94..f6f7372c40 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -275,10 +275,15 @@ 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; else - mask &= ~EM_POPUP_URI_NOT_MAILTO; + mask &= ~(EM_POPUP_URI_NOT_MAILTO|~mask); t->target.mask = mask; @@ -622,9 +627,9 @@ emp_uri_popup_address_add(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem emp_standard_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_NOT_MAILTO }, - { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, NULL, EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, NULL, EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP }, + { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "stock_mail-compose", EM_POPUP_URI_MAILTO }, + { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "gtk-add", EM_POPUP_URI_MAILTO }, }; /* ********************************************************************** */ @@ -858,6 +863,7 @@ 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 }, { 0 } }; |