diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-15 04:19:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-15 04:19:12 +0800 |
| commit | 7ade227e6409c98a4010992450e111cf7bb10520 (patch) | |
| tree | bdd716d894ae2f3b1affaa6bb68950a89441db13 /mail/mail-mt.c | |
| parent | cca29c3424aede2bb3c9ec5a6d255ce490d3511b (diff) | |
| download | gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.gz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.bz2 gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.lz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.xz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.zst gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.zip | |
Merge revisions 35951:35992 from trunk.
svn path=/branches/kill-bonobo/; revision=35994
Diffstat (limited to 'mail/mail-mt.c')
| -rw-r--r-- | mail/mail-mt.c | 7 |
1 files changed, 1 insertions, 6 deletions
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); |