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

Bug #679382 - Saving attachments takes too long, maxes CPU usage

Browse Source
This commit is contained in:
Milan Crha
2012-09-06 14:34:46 +02:00
parent 3451671ce9
commit f568645ff6
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
widgets/misc/e-attachment.c
View File

@ -66,6 +66,7 @@ struct _EAttachmentPrivate {
guint emblem_timeout_id;
gchar *disposition;
gint percent;
gint64 last_percent_notify; /* to avoid excessive notifications */
guint can_show : 1;
guint loading : 1;
@ -415,6 +416,7 @@ attachment_set_loading (EAttachment *attachment,
attachment->priv->percent = 0;
attachment->priv->loading = loading;
attachment->priv->last_percent_notify = 0;
g_object_freeze_notify (G_OBJECT (attachment));
g_object_notify (G_OBJECT (attachment), "percent");
@ -434,6 +436,7 @@ attachment_set_saving (EAttachment *attachment,
{
attachment->priv->percent = 0;
attachment->priv->saving = saving;
attachment->priv->last_percent_notify = 0;
g_object_freeze_notify (G_OBJECT (attachment));
g_object_notify (G_OBJECT (attachment), "percent");
@ -446,14 +449,24 @@ attachment_progress_cb (goffset current_num_bytes,
goffset total_num_bytes,
EAttachment *attachment)
{
gint new_percent;
/* Avoid dividing by zero. */
if (total_num_bytes == 0)
return;
attachment->priv->percent =
(current_num_bytes * 100) / total_num_bytes;
/* do not notify too often, 5 times per second is sufficient */
if (g_get_monotonic_time () - attachment->priv->last_percent_notify < 200000)
return;
g_object_notify (G_OBJECT (attachment), "percent");
attachment->priv->last_percent_notify = g_get_monotonic_time ();
new_percent = (current_num_bytes * 100) / total_num_bytes;
if (new_percent != attachment->priv->percent) {
attachment->priv->percent = new_percent;
g_object_notify (G_OBJECT (attachment), "percent");
}
}
static gboolean