From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:19:12 +0000 Subject: Merge revisions 35951:35992 from trunk. svn path=/branches/kill-bonobo/; revision=35994 --- mail/mail-mt.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'mail/mail-mt.c') diff --git a/mail/mail-mt.c b/mail/mail-mt.c index d147132689..9657da5f13 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -71,8 +71,6 @@ struct _MailMsgPrivate { gboolean cancelable; }; -static GdkPixbuf *progress_icon = NULL; - /* mail_msg stuff */ #ifdef LOG_OPS static FILE *log; @@ -983,9 +981,6 @@ op_status_exec (struct _op_status_msg *m) } else { data->activity_state = 1; - if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); - MAIL_MT_UNLOCK (mail_msg_lock); if (msg->info->desc) what = msg->info->desc (msg); @@ -996,7 +991,7 @@ op_status_exec (struct _op_status_msg *m) what = g_strdup(""); } - data->activity_id = e_activity_handler_cancelable_operation_started (activity_handler, "evolution-mail", progress_icon, what, TRUE, (void (*) (gpointer)) camel_operation_cancel, msg->cancel); + data->activity_id = e_activity_handler_cancelable_operation_started (activity_handler, "evolution-mail", what, TRUE, (void (*) (gpointer)) camel_operation_cancel, msg->cancel); g_free (what); MAIL_MT_LOCK (mail_msg_lock); -- cgit