From e2aaec85d0e2d4fe32a869725645983274a2931b Mon Sep 17 00:00:00 2001 From: 5 Date: Fri, 5 Oct 2001 21:50:12 +0000 Subject: reformatted the menu tables so they're a bit more bloody readable. 2001-10-05 * folder-browser.c: reformatted the menu tables so they're a bit more bloody readable. * mail-folder-cache.c (mail_note_store): Hook into subscribed/unsubscribed events. Only 'add/remove' folders from the add/removed events if we aren't subscribed, otherwise use the subscribed events. Rest of fix for #11831 svn path=/trunk/; revision=13472 --- mail/folder-browser.c | 97 ++++++++++++++++----------------------------------- 1 file changed, 30 insertions(+), 67 deletions(-) (limited to 'mail/folder-browser.c') diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 9299b2fbb9..9efe6df832 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -1359,92 +1359,55 @@ enum { #define MLIST_FILTER (8) static EPopupMenu filter_menu[] = { - { N_("VFolder on _Subject"), NULL, - GTK_SIGNAL_FUNC (vfolder_subject), NULL, - SELECTION_SET }, - { N_("VFolder on Se_nder"), NULL, - GTK_SIGNAL_FUNC (vfolder_sender), NULL, - SELECTION_SET }, - { N_("VFolder on _Recipients"), NULL, - GTK_SIGNAL_FUNC (vfolder_recipient), NULL, - SELECTION_SET }, - { N_("VFolder on Mailing _List"), NULL, - GTK_SIGNAL_FUNC (vfolder_mlist), NULL, - SELECTION_SET | IS_MAILING_LIST }, + { N_("VFolder on _Subject"), NULL, GTK_SIGNAL_FUNC (vfolder_subject), NULL, SELECTION_SET }, + { N_("VFolder on Se_nder"), NULL, GTK_SIGNAL_FUNC (vfolder_sender), NULL, SELECTION_SET }, + { N_("VFolder on _Recipients"), NULL, GTK_SIGNAL_FUNC (vfolder_recipient), NULL, SELECTION_SET }, + { N_("VFolder on Mailing _List"), NULL, GTK_SIGNAL_FUNC (vfolder_mlist), NULL, SELECTION_SET | IS_MAILING_LIST }, E_POPUP_SEPARATOR, - { N_("Filter on Sub_ject"), NULL, - GTK_SIGNAL_FUNC (filter_subject), NULL, - SELECTION_SET }, - { N_("Filter on Sen_der"), NULL, - GTK_SIGNAL_FUNC (filter_sender), NULL, - SELECTION_SET }, - { N_("Filter on Re_cipients"), NULL, - GTK_SIGNAL_FUNC (filter_recipient), NULL, - SELECTION_SET }, - { N_("Filter on _Mailing List"), NULL, - GTK_SIGNAL_FUNC (filter_mlist), NULL, - SELECTION_SET | IS_MAILING_LIST }, + { N_("Filter on Sub_ject"), NULL, GTK_SIGNAL_FUNC (filter_subject), NULL, SELECTION_SET }, + { N_("Filter on Sen_der"), NULL, GTK_SIGNAL_FUNC (filter_sender), NULL, SELECTION_SET }, + { N_("Filter on Re_cipients"), NULL, GTK_SIGNAL_FUNC (filter_recipient), NULL, SELECTION_SET }, + { N_("Filter on _Mailing List"), NULL, GTK_SIGNAL_FUNC (filter_mlist), NULL, SELECTION_SET | IS_MAILING_LIST }, E_POPUP_TERMINATOR }; static EPopupMenu context_menu[] = { - { N_("_Open"), NULL, - GTK_SIGNAL_FUNC (open_msg), NULL, 0 }, - { N_("_Edit as New Message..."), NULL, - GTK_SIGNAL_FUNC (resend_msg), NULL, CAN_RESEND }, - { N_("_Save As..."), NULL, - GTK_SIGNAL_FUNC (save_msg), NULL, 0 }, - { N_("_Print"), NULL, - GTK_SIGNAL_FUNC (print_msg), NULL, 0 }, + { N_("_Open"), NULL, GTK_SIGNAL_FUNC (open_msg), NULL, 0 }, + { N_("_Edit as New Message..."), NULL, GTK_SIGNAL_FUNC (resend_msg), NULL, CAN_RESEND }, + { N_("_Save As..."), NULL, GTK_SIGNAL_FUNC (save_msg), NULL, 0 }, + { N_("_Print"), NULL, GTK_SIGNAL_FUNC (print_msg), NULL, 0 }, E_POPUP_SEPARATOR, - { N_("_Reply to Sender"), NULL, - GTK_SIGNAL_FUNC (reply_to_sender), NULL, 0 }, - { N_("Reply to _List"), NULL, - GTK_SIGNAL_FUNC (reply_to_list), NULL, 0 }, - { N_("Reply to _All"), NULL, - GTK_SIGNAL_FUNC (reply_to_all), NULL, 0 }, - { N_("_Forward"), NULL, - GTK_SIGNAL_FUNC (forward), NULL, 0 }, + { N_("_Reply to Sender"), NULL, GTK_SIGNAL_FUNC (reply_to_sender), NULL, 0 }, + { N_("Reply to _List"), NULL, GTK_SIGNAL_FUNC (reply_to_list), NULL, 0 }, + { N_("Reply to _All"), NULL, GTK_SIGNAL_FUNC (reply_to_all), NULL, 0 }, + { N_("_Forward"), NULL, GTK_SIGNAL_FUNC (forward), NULL, 0 }, { "", NULL, (NULL), NULL, 0 }, - { N_("Mar_k as Read"), NULL, - GTK_SIGNAL_FUNC (mark_as_seen), NULL, CAN_MARK_READ }, - { N_("Mark as U_nread"), NULL, - GTK_SIGNAL_FUNC (mark_as_unseen), NULL, CAN_MARK_UNREAD }, - { N_("Mark as _Important"), NULL, - GTK_SIGNAL_FUNC (mark_as_important), NULL, CAN_MARK_IMPORTANT }, - { N_("Mark as Unim_portant"), NULL, - GTK_SIGNAL_FUNC (mark_as_unimportant), NULL, CAN_MARK_UNIMPORTANT }, + { N_("Mar_k as Read"), NULL, GTK_SIGNAL_FUNC (mark_as_seen), NULL, CAN_MARK_READ }, + { N_("Mark as U_nread"), NULL, GTK_SIGNAL_FUNC (mark_as_unseen), NULL, CAN_MARK_UNREAD }, + { N_("Mark as _Important"), NULL, GTK_SIGNAL_FUNC (mark_as_important), NULL, CAN_MARK_IMPORTANT }, + { N_("Mark as Unim_portant"), NULL, GTK_SIGNAL_FUNC (mark_as_unimportant), NULL, CAN_MARK_UNIMPORTANT }, E_POPUP_SEPARATOR, - { N_("_Move to Folder..."), NULL, - GTK_SIGNAL_FUNC (move_msg), NULL, 0 }, - { N_("_Copy to Folder..."), NULL, - GTK_SIGNAL_FUNC (copy_msg), NULL, 0 }, - { N_("_Delete"), NULL, - GTK_SIGNAL_FUNC (delete_msg), NULL, CAN_DELETE }, - { N_("_Undelete"), NULL, - GTK_SIGNAL_FUNC (undelete_msg), NULL, CAN_UNDELETE }, + { N_("_Move to Folder..."), NULL, GTK_SIGNAL_FUNC (move_msg), NULL, 0 }, + { N_("_Copy to Folder..."), NULL, GTK_SIGNAL_FUNC (copy_msg), NULL, 0 }, + { N_("_Delete"), NULL, GTK_SIGNAL_FUNC (delete_msg), NULL, CAN_DELETE }, + { N_("_Undelete"), NULL, GTK_SIGNAL_FUNC (undelete_msg), NULL, CAN_UNDELETE }, E_POPUP_SEPARATOR, - { N_("Add Sender to Address Book"), NULL, - GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 }, - { "", NULL, - GTK_SIGNAL_FUNC (NULL), NULL, 0 }, - - { N_("Apply Filters"), NULL, - GTK_SIGNAL_FUNC (apply_filters), NULL, 0 }, - { "", NULL, - GTK_SIGNAL_FUNC (NULL), NULL, 0 }, - { N_("Create Ru_le From Message"), NULL, - GTK_SIGNAL_FUNC (NULL), filter_menu, SELECTION_SET }, + { N_("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 }, + { "", NULL, GTK_SIGNAL_FUNC (NULL), NULL, 0 }, + + { N_("Apply Filters"), NULL, GTK_SIGNAL_FUNC (apply_filters), NULL, 0 }, + { "", NULL, GTK_SIGNAL_FUNC (NULL), NULL, 0 }, + { N_("Create Ru_le From Message"), NULL, GTK_SIGNAL_FUNC (NULL), filter_menu, SELECTION_SET }, E_POPUP_TERMINATOR }; -- cgit