diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-composer-utils.c | 9 | ||||
| -rw-r--r-- | mail/em-event.c | 4 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 17 | ||||
| -rw-r--r-- | mail/mail-folder-cache.c | 8 |
5 files changed, 40 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index cf1a4ad1d0..75b92d6230 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2004-10-22 Not Zed <NotZed@Ximian.com> + + * em-event.c (eme_target_free): duh, they're camel not gobjects. + + * em-folder-view.c (emfv_list_done_message_selected): added a + message.reading event. + 2004-10-22 Nat Friedman <nat@novell.com> * em-event.c: Add a REPLY_ALL flag to the Message target. diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index a4c328020b..01b3561659 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1762,7 +1762,14 @@ em_utils_reply_to_message(CamelFolder *folder, const char *uid, CamelMimeMessage g_return_if_fail(message != NULL); - /* EVENT: message.replying definition */ + /** + * @Event: message.replying + * @Title: Message being replied to + * @Target: EMEventTargetMessage + * + * message.replying is emitted when a user starts replying to a message. + */ + eme = em_event_peek(); target = em_event_target_new_message(eme, folder, message, uid, mode == REPLY_MODE_ALL ? EM_EVENT_MESSAGE_REPLY_ALL : 0); diff --git a/mail/em-event.c b/mail/em-event.c index 8fd2dc3e38..dc3462bc3b 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -71,8 +71,8 @@ eme_target_free(EEvent *ep, EEventTarget *t) case EM_EVENT_TARGET_MESSAGE: { EMEventTargetMessage *s = (EMEventTargetMessage *)t; - g_object_unref(s->folder); - g_object_unref(s->message); + camel_object_unref(s->folder); + camel_object_unref(s->message); g_free(s->uid); break; } } diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 61d5a4c1ab..282a9a24af 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -78,6 +78,7 @@ #include "em-composer-utils.h" #include "em-marshal.h" #include "em-menu.h" +#include "em-event.h" #include <gtkhtml/gtkhtml.h> #include <gtkhtml/htmlobject.h> @@ -1986,6 +1987,8 @@ static void emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) { EMFolderView *emfv = data; + EMEvent *eme; + EMEventTargetMessage *target; if (emfv->preview == NULL) { emfv->priv->nomarkseen = FALSE; @@ -1993,7 +1996,19 @@ emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeM emfv_enable_menus(emfv); return; } - + + /** + * @Event: message.reading + * @Title: Viewing a message + * @Target: EMEventTargetMessage + * + * message.reading is emitted whenever a user views a message. + */ + /* TODO: do we emit a message.reading with no message when we're looking at nothing or don't care? */ + eme = em_event_peek(); + target = em_event_target_new_message(eme, folder, msg, uid, 0); + e_event_emit((EEvent *)eme, "message.reading", (EEventTarget *)target); + em_format_format((EMFormat *)emfv->preview, folder, uid, msg); if (emfv->priv->seen_id) diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 91616dc536..16b7177df5 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -245,7 +245,13 @@ real_flush_updates(void *o, void *event_data, void *data) EMEvent *e = em_event_peek(); EMEventTargetFolder *t = em_event_target_new_folder(e, up->uri, up->new?EM_EVENT_FOLDER_NEWMAIL:0); - /* EVENT: folder.changed definition */ + /** + * @Event: folder.changed + * @Title: Folder changed + * @Target: EMEventTargetFolder + * + * folder.changed is emitted whenever a folder changes. There is no detail on how the folder has changed. + */ e_event_emit((EEvent *)e, "folder.changed", (EEventTarget *)t); } |