evolution r37519 - trunk/mail

[pchen svn gnome org]

Author: pchen
Date: Mon Apr 13 09:03:55 2009
New Revision: 37519
URL: http://svn.gnome.org/viewvc/evolution?rev=37519&view=rev

Log:
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.

Modified:
   trunk/mail/ChangeLog
   trunk/mail/mail-mt.c
   trunk/mail/mail-ops.c

Modified: trunk/mail/mail-mt.c
==============================================================================
--- trunk/mail/mail-mt.c	(original)
+++ trunk/mail/mail-mt.c	Mon Apr 13 09:03:55 2009
@@ -508,7 +508,7 @@
 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_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);

Modified: trunk/mail/mail-ops.c
==============================================================================
--- trunk/mail/mail-ops.c	(original)
+++ trunk/mail/mail-ops.c	Mon Apr 13 09:03:55 2009
@@ -800,6 +800,12 @@
 		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 @@
 
 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