diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-04-15 05:24:07 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-04-15 05:24:07 +0800 |
| commit | 4e3776a37dee9b520e9ec71a051dc7f3ceb836bd (patch) | |
| tree | d5b704f9fa823a9bf80b777fc82538df437ea325 /mail/folder-browser-factory.c | |
| parent | 6dce8c2f32c5738b78a6e7b26e15db8b562981e5 (diff) | |
| download | gsoc2013-evolution-4e3776a37dee9b520e9ec71a051dc7f3ceb836bd.tar.gz gsoc2013-evolution-4e3776a37dee9b520e9ec71a051dc7f3ceb836bd.tar.zst gsoc2013-evolution-4e3776a37dee9b520e9ec71a051dc7f3ceb836bd.zip | |
Only use non-NULL contexts. (mail_crypto_pgp_mime_part_encrypt): Same.
2001-04-14 Jeffrey Stedfast <fejj@ximian.com>
* mail-crypto.c (mail_crypto_pgp_mime_part_verify): Only use
non-NULL contexts.
(mail_crypto_pgp_mime_part_encrypt): Same.
(mail_crypto_pgp_mime_part_decrypt): And here too.
* mail-format.c (try_inline_pgp_sig): Make sure to not use the
context if it is NULL.
(decode_pgp): Same.
* folder-browser-factory.c: Added stuff for filtering/vfoldering
on mailinglists.
svn path=/trunk/; revision=9315
Diffstat (limited to 'mail/folder-browser-factory.c')
| -rw-r--r-- | mail/folder-browser-factory.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 4d7644d149..9f6abf43bb 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -68,7 +68,7 @@ BonoboUIVerb verbs [] = { BONOBO_UI_UNSAFE_VERB ("MessageResend", resend_msg), BONOBO_UI_UNSAFE_VERB ("MessageSaveAs", save_msg), BONOBO_UI_UNSAFE_VERB ("MessagePrint", print_msg), - BONOBO_UI_UNSAFE_VERB ("MessageReplySndr", reply_to_sender), + BONOBO_UI_UNSAFE_VERB ("MessageReplySender", reply_to_sender), BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", reply_to_all), BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", forward_attached), BONOBO_UI_UNSAFE_VERB ("MessageForwardInlined", forward_inlined), @@ -87,13 +87,15 @@ BonoboUIVerb verbs [] = { BONOBO_UI_UNSAFE_VERB ("MessageApplyFilters", apply_filters), - BONOBO_UI_UNSAFE_VERB ("MessageVFolderSubj", vfolder_subject), - BONOBO_UI_UNSAFE_VERB ("MessageVFolderSndr", vfolder_sender), - BONOBO_UI_UNSAFE_VERB ("MessageVFolderRecip", vfolder_recipient), + BONOBO_UI_UNSAFE_VERB ("MessageVFolderSubject", vfolder_subject), + BONOBO_UI_UNSAFE_VERB ("MessageVFolderSender", vfolder_sender), + BONOBO_UI_UNSAFE_VERB ("MessageVFolderRecipient", vfolder_recipient), + BONOBO_UI_UNSAFE_VERB ("MessageVFolderMailingList", vfolder_mlist), - BONOBO_UI_UNSAFE_VERB ("MessageFilterSubj", filter_subject), - BONOBO_UI_UNSAFE_VERB ("MessageFilterSndr", filter_sender), - BONOBO_UI_UNSAFE_VERB ("MessageFilterRecip", filter_recipient), + BONOBO_UI_UNSAFE_VERB ("MessageFilterSubject", filter_subject), + BONOBO_UI_UNSAFE_VERB ("MessageFilterSender", filter_sender), + BONOBO_UI_UNSAFE_VERB ("MessageFilterRecipient", filter_recipient), + BONOBO_UI_UNSAFE_VERB ("MessageFilterMailingList", filter_mlist), BONOBO_UI_UNSAFE_VERB ("MessageHideClear", hide_none), BONOBO_UI_UNSAFE_VERB ("MessageHideRead", hide_read), @@ -103,7 +105,7 @@ BonoboUIVerb verbs [] = { /* Folder Menu */ BONOBO_UI_UNSAFE_VERB ("FolderExpunge", expunge_folder), BONOBO_UI_UNSAFE_VERB ("FolderConfig", configure_folder), - BONOBO_UI_UNSAFE_VERB ("ActionsEmptyTrash", empty_trash), + BONOBO_UI_UNSAFE_VERB ("EmptyTrash", empty_trash), /* Toolbar specific */ BONOBO_UI_UNSAFE_VERB ("MailStop", stop_threads), @@ -130,7 +132,7 @@ static EPixmap pixcache [] = { E_PIXMAP ("/menu/Actions/Component/SendReceive", "send-receive.xpm"), E_PIXMAP ("/menu/Actions/Component/MessageMove", "move_message.xpm"), E_PIXMAP ("/menu/Actions/Component/MessageReplyAll", "reply_to_all.xpm"), - E_PIXMAP ("/menu/Actions/Component/MessageReplySndr", "reply.xpm"), + E_PIXMAP ("/menu/Actions/Component/MessageReplySender", "reply.xpm"), E_PIXMAP ("/menu/Tools/Component/SetMailConfig", "configure_16_mail.xpm"), |