aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-12-02 12:13:18 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-12-02 12:13:18 +0800
commitd74d39e1a0d5d89dc4a4fc2cae70167d69b617a3 (patch)
tree0658f0ae5133bd670b79c21c57b0ce4cc6de88f9
parente8068e8fff9cf38b135927c12b2b02dd3f358d8c (diff)
downloadgsoc2013-evolution-d74d39e1a0d5d89dc4a4fc2cae70167d69b617a3.tar.gz
gsoc2013-evolution-d74d39e1a0d5d89dc4a4fc2cae70167d69b617a3.tar.zst
gsoc2013-evolution-d74d39e1a0d5d89dc4a4fc2cae70167d69b617a3.zip
(do_op_status): Use data->activity_id, not local
activity_id. svn path=/trunk/; revision=23558
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-mt.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index fe425c4cb9..dba68ab36b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
2003-12-01 Ettore Perazzoli <ettore@ximian.com>
+ * mail-mt.c (do_op_status): Use data->activity_id, not local
+ activity_id.
+
+2003-12-01 Ettore Perazzoli <ettore@ximian.com>
+
* mail-mt.c (struct _mail_msg_priv): Remove member "activity".
(mail_operation_status): Un-#if 0 the code.
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 64bfcfd6f2..7d3ac53e3b 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -856,7 +856,6 @@ static void do_op_status(struct _mail_msg *mm)
struct _mail_msg_priv *data;
char *out, *p, *o, c;
int pc;
- guint activity_id;
g_assert (mail_gui_thread == pthread_self ());
@@ -903,7 +902,7 @@ static void do_op_status(struct _mail_msg *mm)
else
what = _("Working");
- activity_id = e_activity_handler_operation_started (activity_handler, "evolution-mail", progress_icon, what, TRUE);
+ data->activity_id = e_activity_handler_operation_started (activity_handler, "evolution-mail", progress_icon, what, TRUE);
if (msg->ops->describe_msg)
g_free (what);
@@ -918,14 +917,13 @@ static void do_op_status(struct _mail_msg *mm)
g_free (msg);
} else {
data->activity_state = 2;
- data->activity_id = activity_id;
MAIL_MT_UNLOCK (mail_msg_lock);
}
return;
}
} else if (data->activity_id != 0) {
MAIL_MT_UNLOCK (mail_msg_lock);
- e_activity_handler_operation_progressing (activity_handler, activity_id, out, (double)(pc/100.0));
+ e_activity_handler_operation_progressing (activity_handler, data->activity_id, out, (double)(pc/100.0));
} else {
MAIL_MT_UNLOCK (mail_msg_lock);
}