diff options
Diffstat (limited to 'mail/mail-ops.c')
| -rw-r--r-- | mail/mail-ops.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c index cbccb274db..8a3b4076df 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -145,7 +145,7 @@ static void filter_folder_free (struct _mail_msg *mm) { struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm; - int count, i; + int i; if (m->source_folder) camel_object_unref (CAMEL_OBJECT (m->source_folder)); @@ -163,22 +163,6 @@ filter_folder_free (struct _mail_msg *mm) if (m->destination) camel_object_unref (CAMEL_OBJECT (m->destination)); - count = camel_filter_driver_get_filtered_count (m->driver); - camel_filter_driver_reset_filtered_count (m->driver); - - if (count > 0) { - switch (mail_config_get_new_mail_notify ()) { - case MAIL_CONFIG_NOTIFY_BEEP: - gdk_beep (); - break; - case MAIL_CONFIG_NOTIFY_EXEC: - mail_execute_shell_command (m->driver, mail_config_get_new_mail_notify_command (), NULL); - break; - default: - break; - } - } - if (m->driver) camel_object_unref (CAMEL_OBJECT (m->driver)); } @@ -271,7 +255,7 @@ fetch_mail_fetch (struct _mail_msg *mm) { struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm; struct _filter_mail_msg *fm = (struct _filter_mail_msg *)mm; - int i; + int count, i; if (m->cancel) camel_operation_register (m->cancel); @@ -363,6 +347,22 @@ fetch_mail_fetch (struct _mail_msg *mm) if (m->cancel) camel_operation_unregister (m->cancel); + count = camel_filter_driver_get_filtered_count (fm->driver); + camel_filter_driver_reset_filtered_count (fm->driver); + + if (count > 0) { + switch (mail_config_get_new_mail_notify ()) { + case MAIL_CONFIG_NOTIFY_BEEP: + gdk_beep (); + break; + case MAIL_CONFIG_NOTIFY_EXEC: + mail_execute_shell_command (fm->driver, mail_config_get_new_mail_notify_command (), NULL); + break; + default: + break; + } + } + /* we unref this here as it may have more work to do (syncing folders and whatnot) before we are really done */ /* should this be cancellable too? (i.e. above unregister above) */ |