diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2004-01-17 08:52:06 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2004-01-17 08:52:06 +0800 |
| commit | fa20d6a1f4c0c792ceefa031922da750eb60c32e (patch) | |
| tree | 16859d85dc3efa973fc9f233dd65ef43e0dd798a /addressbook/gui/contact-editor/e-contact-editor.h | |
| parent | 661c8fe4978af68a06b3c67076606edc8de7a068 (diff) | |
| download | gsoc2013-evolution-fa20d6a1f4c0c792ceefa031922da750eb60c32e.tar.gz gsoc2013-evolution-fa20d6a1f4c0c792ceefa031922da750eb60c32e.tar.zst gsoc2013-evolution-fa20d6a1f4c0c792ceefa031922da750eb60c32e.zip | |
Don't run callback if the action was cancelled. (load_source_cb): Ditto.
2004-01-16 Hans Petter Jansson <hpj@ximian.com>
* gui/component/addressbook.c (load_source_auth_cb): Don't run
callback if the action was cancelled.
(load_source_cb): Ditto.
(addressbook_load_source): Return an ID for the load attempt.
(addressbook_load_source_cancel): Implement, allows cancelling a
load attempt.
* gui/contact-editor/e-contact-editor.c (new_target_cb): Clear the
values for in-progress load operation. Only unref new_book if it's
non-NULL.
(cancel_load): Implement. Cancels the load operation if one is in
progress.
(source_selected): Cancel any running load operation before starting
a new one. Set up in-progress values.
(e_contact_editor_init): Clear the in-progress values.
(e_contact_editor_dispose): Cancel load operation.
(e_contact_editor_set_property): If a new target book is set, cancel
any conflicting load operation in progress.
* gui/widgets/e-addressbook-view.c (set_paned_position): Remove
debug output.
(get_paned_position): Ditto.
svn path=/trunk/; revision=24287
Diffstat (limited to 'addressbook/gui/contact-editor/e-contact-editor.h')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index ddb4ad3a5f..069cc7d0cc 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -108,6 +108,10 @@ struct _EContactEditor guint in_async_call : 1; EList *writable_fields; + + /* ID for async load_source call */ + guint load_source_id; + EBook *load_book; }; struct _EContactEditorClass |