callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #467659 (bnc)

Browse Source 
2009-04-13  Chenthill Palanisamy  <pchenthill@novell.com>

	Fixes #467659 (bnc)
	* mail/mail-mt.c:
	* mail/mail-ops.c: Set the description for send mail
	operation.

svn path=/trunk/; revision=37519
This commit is contained in:
Chenthill Palanisamy
2009-04-13 09:03:55 +00:00
committed by Chenthill Palanisamy
parent 9896e4f7db
commit cecdc505b1
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mail/ChangeLog
View File

@ -1,3 +1,10 @@
2009-04-13 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #467659 (bnc)
* mail/mail-mt.c:
* mail/mail-ops.c: Set the description for send mail
operation.
2009-04-13 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #471083 (bnc)

4
mail/mail-mt.c
View File

@ -508,7 +508,7 @@ mail_msg_idle_cb (void)
static void
mail_msg_proxy (MailMsg *msg)
{
if (msg->info->desc != NULL) {
if (msg->info->desc != NULL && msg->cancel) {
gchar *text = msg->info->desc (msg);
camel_operation_register (msg->cancel);
camel_operation_start (msg->cancel, "%s", text);
@ -521,7 +521,7 @@ mail_msg_proxy (MailMsg *msg)
mail_disable_stop ();
}
if (msg->info->desc != NULL) {
if (msg->info->desc != NULL && msg->cancel) {
camel_operation_end (msg->cancel);
camel_operation_unregister (msg->cancel);
MAIL_MT_LOCK (mail_msg_lock);

8
mail/mail-ops.c
View File

@ -800,6 +800,12 @@ send_queue_done (struct _send_queue_msg *m)
m->done(m->destination, m->data);
}
static gchar *
send_queue_desc (struct _append_msg *m)
{
return g_strdup (_("Sending message"));
}
static void
send_queue_free (struct _send_queue_msg *m)
{
@ -813,7 +819,7 @@ send_queue_free (struct _send_queue_msg *m)
static MailMsgInfo send_queue_info = {
sizeof (struct _send_queue_msg),
(MailMsgDescFunc) NULL,
(MailMsgDescFunc) send_queue_desc,
(MailMsgExecFunc) send_queue_exec,
(MailMsgDoneFunc) send_queue_done,
(MailMsgFreeFunc) send_queue_free