From bdad58fc5f68ee7bcf42a2a6537b7d744abd16af Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 12 Mar 2003 06:46:38 +0000 Subject: [ fixes bug #39507 ] new function, sync the models after we do a search. 2003-03-11 Chris Toshok [ fixes bug #39507 ] * gui/component/select-names/e-select-names.c (search_result): new function, sync the models after we do a search. (addressbook_model_set_uri): connect to search_result. svn path=/trunk/; revision=20260 --- addressbook/ChangeLog | 37 ++++++++++++++++++++++ .../gui/component/select-names/e-select-names.c | 12 +++++++ 2 files changed, 49 insertions(+) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index fd516fcb6d..005b64f422 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,40 @@ +2003-03-11 Chris Toshok + + [ fixes bug #39507 ] + * gui/component/select-names/e-select-names.c (search_result): new + function, sync the models after we do a search. + (addressbook_model_set_uri): connect to search_result. + +2003-03-11 Chris Toshok + + * gui/component/select-names/e-select-names.c + (e_select_names_init): fix compiler warnings about deprecated + functions. + (e_select_names_child_free): unref the table model. + (remove_address): re-enable. + (section_right_click_cb): this is an ETable callback now. + (e_select_names_add_section): remove a gross gross awful hack, and + make the recipient tables ETables instead EEntry's. We lose the + nice underlining, but we can add that back in as another ETable + style (like strikeout and bold), and we also fix the longstanding + scrolling problems (like bug #25148) and can finally remove + addresses by double clicking on them (which is also a bug + someplace I think.. dunno the # offhand.) + + * gui/component/select-names/e-select-names-table-model.c + (clear_info): always set the count to -1, regardless of what + model->data is. + + * gui/component/select-names/e-select-names-model.c: remove some + unused enums. + + * gui/component/select-names/Makefile.am (etspec_DATA): add + e-select-names-section.etspec + + * gui/component/select-names/e-select-names-section.etspec: new + file, spec for the To:/Cc:/Bcc: etable's in the select-names + dialog. + 2003-03-11 Not Zed * backend/pas/pas-backend-file.c (INITIAL_VCARD): Updated phone diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index ed8a3c3c45..51af18c78f 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -52,6 +52,8 @@ static void e_select_names_class_init (ESelectNamesClass *klass); static void e_select_names_dispose (GObject *object); static void update_query (GtkWidget *widget, ESelectNames *e_select_names); +static void sync_table_and_models (ESelectNamesModel *triggering_model, ESelectNames *esl); + extern EvolutionShellClient *global_shell_client; static GtkDialogClass *parent_class = NULL; @@ -111,6 +113,12 @@ e_select_names_class_init (ESelectNamesClass *klass) GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2); GtkWidget *e_addressbook_create_folder_selector(char *name, char *string1, char *string2, int num1, int num2); +static void +search_result (EAddressbookModel *model, EBookViewStatus status, ESelectNames *esn) +{ + sync_table_and_models (NULL, esn); +} + static void set_book(EBook *book, EBookStatus status, ESelectNames *esn) { @@ -143,6 +151,10 @@ addressbook_model_set_uri(ESelectNames *e_select_names, EAddressbookModel *model book = e_book_new(); + g_signal_connect (model, + "search_result", G_CALLBACK (search_result), + e_select_names); + g_object_ref(e_select_names); g_object_ref(model); addressbook_load_uri(book, book_uri, (EBookCallback) set_book, e_select_names); -- cgit v1.2.3