diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-22 04:21:19 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-23 02:21:22 +0800 |
commit | c881b5bc5e61d04b18d4ab46ad70533e7340d15b (patch) | |
tree | e70a3ed0d2f93dacfe20d856de4d29578beb2e50 /mail/mail-vfolder.c | |
parent | f0714755e2fa8b06425907c2cf189abd3a1b7119 (diff) | |
download | gsoc2013-evolution-c881b5bc5e61d04b18d4ab46ad70533e7340d15b.tar.gz gsoc2013-evolution-c881b5bc5e61d04b18d4ab46ad70533e7340d15b.tar.zst gsoc2013-evolution-c881b5bc5e61d04b18d4ab46ad70533e7340d15b.zip |
Simplify EActivity.
With unintrusive error dialogs gone, we can cut some unnecessary bits
out of EActivity.
I'm also adding a new enum property called "state", which is one of:
E_ACTIVITY_RUNNING
E_ACTIVITY_WAITING
E_ACTIVITY_CANCELLED
E_ACTIVITY_COMPLETED
The state of an activity must be explicitly changed. In particular,
when the user cancels an activity the state should be set only after
confirming the operation has been cancelled and not when cancellation
is requested (e.g. after receiving a G_IO_ERROR_CANCELLED, not when
the GCancellable emits "cancelled"). EActivityBar and EActivityProxy
widgets have been updated to make this distinction clearer in the UI.
E_ACTIVITY_WAITING will be used when activities have to be queued and
dispatched in sequence, which I haven't written yet.
Diffstat (limited to 'mail/mail-vfolder.c')
-rw-r--r-- | mail/mail-vfolder.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index eb447ea888..6ed6a61d90 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -88,7 +88,9 @@ vfolder_setup_desc (struct _setup_msg *m) } static void -vfolder_setup_exec (struct _setup_msg *m) +vfolder_setup_exec (struct _setup_msg *m, + GCancellable *cancellable, + GError **error) { GList *l, *list = NULL; CamelFolder *folder; @@ -243,7 +245,9 @@ vfolder_adduri_desc (struct _adduri_msg *m) } static void -vfolder_adduri_exec (struct _adduri_msg *m) +vfolder_adduri_exec (struct _adduri_msg *m, + GCancellable *cancellable, + GError **error) { GList *l; CamelFolder *folder = NULL; @@ -252,8 +256,6 @@ vfolder_adduri_exec (struct _adduri_msg *m) if (vfolder_shutdown) return; - d(printf("%s uri to vfolder: %s\n", m->remove?"Removing":"Adding", m->uri)); - folder_cache = e_mail_session_get_folder_cache (m->session); /* we dont try lookup the cache if we are removing it, its no longer there */ @@ -266,8 +268,7 @@ vfolder_adduri_exec (struct _adduri_msg *m) if (folder == NULL) folder = e_mail_session_uri_to_folder_sync ( - m->session, m->uri, 0, - m->base.cancellable, &m->base.error); + m->session, m->uri, 0, cancellable, error); if (folder != NULL) { l = m->folders; |