From 649bc025dbf8807ab001c874a3f53de1d1826e5b Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 20 Jun 2001 00:45:48 +0000 Subject: track change to e_addressbook_show_contact_editor signature. 2001-06-19 Chris Toshok * gui/widgets/e-addressbook-view.c (table_double_click): track change to e_addressbook_show_contact_editor signature. * gui/widgets/e-minicard-view.c (e_minicard_view_event): same. * gui/widgets/e-minicard.c (e_minicard_event): same. * gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog): add an entry for "Card ID already exists". (e_addressbook_show_contact_editor): track the change to signal names and e_contact_editor_new signature here. * gui/widgets/e-addressbook-util.h: change e_addressbook_show_contact_editor's signature to match e_contact_editor_new more closely. * gui/widgets/e-addressbook-table-adapter.c (unlink_model): free up the simple mapping to plug a potentially sizeable memory leak. * gui/component/select-names/e-select-names-text-model.c (e_select_names_text_model_activate_obj): call e_addressbook_show_contact_editor here. * gui/component/select-names/e-select-names-popup.c (edit_contact_info_have_book_cb): remove the get_supported_fields stuff, since the contact editor handles it for us now, and call e_addressbook_show_contact_editor. * gui/component/e-address-popup.c (edit_contact_info_cb): same. * gui/component/addressbook.c (new_contact_cb): track change to e_addressbook_show_contact_editor. svn path=/trunk/; revision=10318 --- addressbook/gui/component/e-address-popup.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'addressbook/gui/component/e-address-popup.c') diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c index 134ce1241b..81add0e243 100644 --- a/addressbook/gui/component/e-address-popup.c +++ b/addressbook/gui/component/e-address-popup.c @@ -214,20 +214,13 @@ e_address_popup_new (void) } static void -found_fields_cb (EBook *book, EBookStatus status, EList *writable_fields, gpointer closure) +edit_contact_info_cb (EAddressPopup *pop) { - EAddressPopup *pop = E_ADDRESS_POPUP (closure); - EContactEditor *ce = e_contact_editor_new (pop->card, FALSE, writable_fields, FALSE); + EContactEditor *ce = e_addressbook_show_contact_editor (common_book, pop->card, FALSE, TRUE); e_contact_editor_raise (ce); gtk_widget_destroy (GTK_WIDGET (pop)); } -static void -edit_contact_info_cb (EAddressPopup *pop) -{ - e_book_get_supported_fields (common_book, found_fields_cb, pop); -} - static void e_address_popup_cardify (EAddressPopup *pop, ECard *card) { -- cgit