diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-ops.c | 2 | ||||
| -rw-r--r-- | mail/mail-view.c | 8 | ||||
| -rw-r--r-- | mail/mail.h | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index a7f41bcbb7..e5b6a2ef32 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,9 +1,13 @@ 2000-08-09 Jeffrey Stedfast <fejj@helixcode.com> + * mail-view.c (mail_view_create): Changed to only take a + FolderBrowser argument + * mail-ops.c (real_view_msg): Create a new FolderBrowser for each message being opened in a new window. Also set the message_list->cursor_uid and mail_display->current_message to the appropriate values. + (real_view_msg): Updated to reflect changes in the mail_view_create * message-list.c (on_right_click): Nicify a little, add in a menu separator between VFolder and Filter stuff. diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 7afd630899..5cc426d2ad 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1103,7 +1103,7 @@ real_view_msg (MessageList *ml, const char *uid, gpointer user_data) fb->message_list->cursor_uid = uid; fb->mail_display->current_message = msg; - view = mail_view_create (msg, fb); + view = mail_view_create (fb); gtk_widget_show (view); } diff --git a/mail/mail-view.c b/mail/mail-view.c index b86284e250..54861f7649 100644 --- a/mail/mail-view.c +++ b/mail/mail-view.c @@ -82,13 +82,16 @@ static GnomeUIInfo mail_view_menubar[] = }; GtkWidget * -mail_view_create (CamelMimeMessage *msg, FolderBrowser *folder_browser) +mail_view_create (FolderBrowser *folder_browser) { + CamelMimeMessage *msg; GtkWidget *window; GtkWidget *toolbar; GtkWidget *mail_display; char *subject; + msg = folder_browser->mail_display->current_message; + subject = (char *) camel_mime_message_get_subject (msg); if (!subject) subject = ""; @@ -120,8 +123,7 @@ mail_view_create (CamelMimeMessage *msg, FolderBrowser *folder_browser) mail_view_menubar[1].widget, (GtkDestroyNotify) gtk_widget_unref); - mail_display = mail_display_new (folder_browser); - mail_display_set_message (MAIL_DISPLAY (mail_display), CAMEL_MEDIUM (msg)); + mail_display = folder_browser->mail_display; gtk_widget_set_usize (mail_display, 600, 600); gnome_app_set_contents (GNOME_APP (window), mail_display); diff --git a/mail/mail.h b/mail/mail.h index 60d444bd78..3ff7422370 100644 --- a/mail/mail.h +++ b/mail/mail.h @@ -84,7 +84,7 @@ void providers_config (BonoboUIHandler *uih, void *user_data, const char *path); void configure_folder(BonoboUIHandler *uih, void *user_data, const char *path); /* mail view */ -GtkWidget *mail_view_create (CamelMimeMessage *msg, FolderBrowser *folder_browser); +GtkWidget *mail_view_create (FolderBrowser *folder_browser); /* session */ void session_init (void); |