aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-send-recv.c3
2 files changed, 9 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8bf754f62d..f418adefa4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-02 Lucian Langa <lucilanga@gnome.org>
+
+ ** Fix for bug #535689
+
+ * mail-send-recv.c: (build_dialog): Transmit
+ gd data to hook's event target data
+
2008-06-02 Milan Crha <mcrha@redhat.com>
** Fix for bug #534312
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 7d1db25233..19486dce3f 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -552,6 +552,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
g_object_unref (iter);
+ /* we also need gd during emition to be able to catch Cancel All */
+ data->gd = gd;
/* Hook: If some one wants to hook on to the sendreceive dialog, this is the way to go. */
target = em_event_target_new_send_receive (em_event_peek(), table, data, row, EM_EVENT_SEND_RECEIVE);
e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target);
@@ -628,7 +630,6 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
g_object_weak_ref ((GObject *) gd, (GWeakNotify) dialog_destroy_cb, data);
data->infos = list;
- data->gd = gd;
return data;
}