diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-08-10 19:46:31 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-08-10 19:48:00 +0800 |
| commit | c2b6fbabc2ad01938e6cbd1aac1a3c9ed414aa7f (patch) | |
| tree | 244c6aa161817afc0f4b65a93280654b0f9292bd /mail/importers | |
| parent | dbc741999ced3bc4ccf934011fcc5f699ca17a4c (diff) | |
| download | gsoc2013-evolution-c2b6fbabc2ad01938e6cbd1aac1a3c9ed414aa7f.tar gsoc2013-evolution-c2b6fbabc2ad01938e6cbd1aac1a3c9ed414aa7f.tar.gz gsoc2013-evolution-c2b6fbabc2ad01938e6cbd1aac1a3c9ed414aa7f.tar.bz2 gsoc2013-evolution-c2b6fbabc2ad01938e6cbd1aac1a3c9ed414aa7f.tar.lz gsoc2013-evolution-c2b6fbabc2ad01938e6cbd1aac1a3c9ed414aa7f.tar.xz gsoc2013-evolution-c2b6fbabc2ad01938e6cbd1aac1a3c9ed414aa7f.tar.zst gsoc2013-evolution-c2b6fbabc2ad01938e6cbd1aac1a3c9ed414aa7f.zip | |
Bug #655944 - Import dialog is not showing operation progress
Diffstat (limited to 'mail/importers')
| -rw-r--r-- | mail/importers/mail-importer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index 9f98779938..c2619e08a1 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -150,7 +150,7 @@ import_mbox_exec (struct _import_mbox_msg *m, } camel_operation_push_message ( - cancellable, _("Importing '%s'"), + m->cancellable, _("Importing '%s'"), camel_folder_get_full_name (folder)); camel_folder_freeze (folder); while (camel_mime_parser_step (mp, NULL, NULL) == @@ -165,7 +165,7 @@ import_mbox_exec (struct _import_mbox_msg *m, pc = (gint) (100.0 * ((gdouble) camel_mime_parser_tell (mp) / (gdouble) st.st_size)); - camel_operation_progress (cancellable, pc); + camel_operation_progress (m->cancellable, pc); msg = camel_mime_message_new (); if (!camel_mime_part_construct_from_parser_sync ( @@ -202,7 +202,7 @@ import_mbox_exec (struct _import_mbox_msg *m, /* FIXME Not passing a GCancellable or GError here. */ camel_folder_synchronize_sync (folder, FALSE, NULL, NULL); camel_folder_thaw (folder); - camel_operation_pop_message (cancellable); + camel_operation_pop_message (m->cancellable); fail2: g_object_unref (mp); } @@ -312,7 +312,7 @@ import_folders_rec (struct _import_folders_data *m, data_dir = mail_session_get_data_dir (); utf8_filename = g_filename_to_utf8 (filepath, -1, NULL, NULL, NULL); - camel_operation_push_message (NULL, _("Scanning %s"), utf8_filename); + camel_operation_push_message (m->cancellable, _("Scanning %s"), utf8_filename); g_free (utf8_filename); while ( (d=g_dir_read_name (dir))) { @@ -378,7 +378,7 @@ import_folders_rec (struct _import_folders_data *m, } g_dir_close (dir); - camel_operation_pop_message (NULL); + camel_operation_pop_message (m->cancellable); } /** |