diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f28576dddc..4ce63e1ad8 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-08-10 Jason Leach <jleach@ximian.com> + + * mail-callbacks.c (mark_as_unseen): If marking messages as + unread, remove the automatic mark-as-read timer. Bug #4153. + 2001-08-08 Peter Williams <peterw@ximian.com> * component-factory.c (mail_load_storages): Don't load the storage @@ -88,7 +93,6 @@ * message-browser.c (set_bonobo_ui): Remove the "Customize Toolbar" thing. ->>>>>>> 1.1526 2001-08-08 Not Zed <NotZed@Ximian.com> * mail-ops.c (send_mail_send): Dont double-register this diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 99d7444c94..08a13954e4 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -1268,7 +1268,15 @@ mark_as_seen (BonoboUIComponent *uih, void *user_data, const char *path) void mark_as_unseen (BonoboUIComponent *uih, void *user_data, const char *path) { - flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_SEEN, 0); + FolderBrowser *fb = FOLDER_BROWSER (user_data); + + /* Remove the automatic mark-as-read timer first */ + if (fb->seen_id) { + gtk_timeout_remove (fb->seen_id); + fb->seen_id = 0; + } + + flag_messages (fb, CAMEL_MESSAGE_SEEN, 0); } void |