diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 47 | ||||
| -rw-r--r-- | mail/folder-browser-ui.c | 1 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 14 | ||||
| -rw-r--r-- | mail/mail-callbacks.h | 1 |
4 files changed, 24 insertions, 39 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index e9a1659204..45bb07330f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,8 +1,16 @@ +2001-12-03 Jeffrey Stedfast <fejj@ximian.com> + + * folder-browser-ui.c: Setup the UI for the AddSenderToAddressbook + ui verb thingy. + + * mail-callbacks.c (add_sender_to_addrbook): New bonobo-ui + callback that adds a sender to the addressbook. + 2001-12-04 Jon Trowbridge <trow@ximian.com> - * folder-browser-ui.c (folder_browser_ui_set_selection_state): - Allow 'n' and 'p' to work when multiple messages are selected. - Fixes #12062. + * folder-browser-ui.c (folder_browser_ui_set_selection_state): + Allow 'n' and 'p' to work when multiple messages are selected. + Fixes #12062. 2001-11-28 Jeffrey Stedfast <fejj@ximian.com> @@ -21,38 +29,6 @@ * mail-config.c (pgpopen): Fix the boolean check to be && and not ||. -2001-11-27 Jeffrey Stedfast <fejj@ximian.com> - - * mail-format.c (format_mime_part): Reverted the non-NULL - mime-type patch from a little while back, didn't mean to commit - this. - -2001-11-25 Not Zed <NotZed@Ximian.com> - - * mail-config.c (config_read): Enable news accounts that exist - always, since no gui for it. - -2001-11-20 Jeffrey Stedfast <fejj@ximian.com> - - * message-list.c (message_list_select): 'n' shouldn't wrap if 'p' - doesn't. - - * mail-format.c (format_mime_part): Make sure the mime-type is - non-NULL before passing it off to mail_lookup_handler(). - -2001-11-20 Not Zed <NotZed@Ximian.com> - - * folder-browser-ui.c: Disable search if no message - loaded/viewed. Also for #14348. - - * folder-browser.c: Disable "Add sender to addressbook" if we dont - have a message loaded (it wont work). For #14348. - -2001-11-20 Jeffrey Stedfast <fejj@ximian.com> - - * mail-display.c (load_content_loaded): Make sure the mail-display - object is still "alive" before accessing any of it's data. - 2001-11-20 Not Zed <NotZed@Ximian.com> * folder-browser-ui.c: Disable search if no message @@ -66,6 +42,7 @@ * mail-display.c (load_content_loaded): Make sure the mail-display object is still "alive" before accessing any of it's data. +>>>>>>> 1.1943.2.6 2001-11-14 Zbigniew Chyla <cyba@gnome.pl> * mail-autofilter.c (rule_match_recipients, rule_from_message, diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index 4099be2ce3..737f9f279a 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -43,6 +43,7 @@ static BonoboUIVerb message_verbs [] = { BONOBO_UI_UNSAFE_VERB ("MailPrevious", previous_msg), BONOBO_UI_UNSAFE_VERB ("MailPreviousFlagged", previous_flagged_msg), BONOBO_UI_UNSAFE_VERB ("MailPreviousUnread", previous_unread_msg), + BONOBO_UI_UNSAFE_VERB ("AddSenderToAddressbook", add_sender_to_addrbook), BONOBO_UI_UNSAFE_VERB ("MessageApplyFilters", apply_filters), BONOBO_UI_UNSAFE_VERB ("MessageCopy", copy_msg), BONOBO_UI_UNSAFE_VERB ("MessageDelete", delete_msg), diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 4a704b077d..ee30562111 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1399,16 +1399,16 @@ addrbook_sender (GtkWidget *widget, gpointer user_data) return; addr_str = camel_address_format (CAMEL_ADDRESS (addr)); - + win = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (win), _("Sender")); - + control = bonobo_widget_new_control ("OAFIID:GNOME_Evolution_Addressbook_AddressPopup", CORBA_OBJECT_NIL); bonobo_widget_set_property (BONOBO_WIDGET (control), "email", addr_str, NULL); - + bonobo_event_source_client_add_listener (bonobo_widget_get_objref (BONOBO_WIDGET (control)), popup_listener_cb, NULL, NULL, win); @@ -1417,12 +1417,18 @@ addrbook_sender (GtkWidget *widget, gpointer user_data) "destroy", GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (win)); - + gtk_container_add (GTK_CONTAINER (win), control); gtk_widget_show_all (win); } void +add_sender_to_addrbook (BonoboUIComponent *uih, void *user_data, const char *path) +{ + addrbook_sender (NULL, user_data); +} + +void apply_filters (GtkWidget *widget, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); diff --git a/mail/mail-callbacks.h b/mail/mail-callbacks.h index d67b21a874..c2bfe06bfb 100644 --- a/mail/mail-callbacks.h +++ b/mail/mail-callbacks.h @@ -81,6 +81,7 @@ void resend_msg (GtkWidget *widget, gpointer user_data); void search_msg (GtkWidget *widget, gpointer user_data); void load_images (GtkWidget *widget, gpointer user_data); +void add_sender_to_addrbook (BonoboUIComponent *uih, void *user_data, const char *path); void move_msg (BonoboUIComponent *uih, void *user_data, const char *path); void copy_msg (BonoboUIComponent *uih, void *user_data, const char *path); void select_all (BonoboUIComponent *uih, void *user_data, const char *path); |