From fa20d6a1f4c0c792ceefa031922da750eb60c32e Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Sat, 17 Jan 2004 00:52:06 +0000 Subject: Don't run callback if the action was cancelled. (load_source_cb): Ditto. 2004-01-16 Hans Petter Jansson * 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 --- addressbook/gui/contact-editor/e-contact-editor.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addressbook/gui/contact-editor/e-contact-editor.h') 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 -- cgit