diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-28 10:31:47 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-28 23:24:49 +0800 |
| commit | 2c4510e858fcf96e8f3d02f3f92564460752e983 (patch) | |
| tree | 777c673d5fdaf649fb1c9eabd9357eac622b15f6 /mail/em-event.c | |
| parent | 3fe8269156da1b57b0fc7391f5cf07cab6f61606 (diff) | |
| parent | 067ef5580fc287809958d4503691bfcba2b29ee5 (diff) | |
| download | gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.gz gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.zst gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.zip | |
Merge commit 'EVOLUTION_2_27_5' into kill-bonobo
Diffstat (limited to 'mail/em-event.c')
| -rw-r--r-- | mail/em-event.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mail/em-event.c b/mail/em-event.c index 5bc03ac875..2cdbb23125 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -76,6 +76,8 @@ eme_target_free(EEvent *ep, EEventTarget *t) if (s->message) camel_object_unref(s->message); g_free(s->uid); + if (s->composer) + g_object_unref (s->composer); break; } case EM_EVENT_TARGET_COMPOSER : { EMEventTargetComposer *s = (EMEventTargetComposer *)t; @@ -159,7 +161,7 @@ em_event_target_new_composer (EMEvent *eme, const EMsgComposer *composer, guint3 } EMEventTargetMessage * -em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags) +em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage *message, const gchar *uid, guint32 flags, EMsgComposer *composer) { EMEventTargetMessage *t = e_event_target_new(&eme->popup, EM_EVENT_TARGET_MESSAGE, sizeof(*t)); @@ -171,6 +173,8 @@ em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage if (message) camel_object_ref(message); t->target.mask = ~flags; + if (composer) + t->composer = g_object_ref(G_OBJECT(composer)); return t; } @@ -218,6 +222,7 @@ static const EEventHookTargetMask emeh_composer_masks[] = { static const EEventHookTargetMask emeh_message_masks[] = { { "replyall", EM_EVENT_MESSAGE_REPLY_ALL }, + { "reply", EM_EVENT_MESSAGE_REPLY }, { NULL } }; |