diff options
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 6fb3f42b06..d2aa51b2db 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2002-04-26 Christopher James Lahey <clahey@ximian.com> + + * gui/component/select-names/e-select-names.c + (e_select_names_child_free): Unref the text_model here instead of + the model, since the model never gets set. Removed the model + field since it's no longer used. + 2002-04-24 Christopher James Lahey <clahey@ximian.com> * gui/component/ldap-config.c: Updated this for the new diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 782905de23..7e9b2a6409 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -65,7 +65,6 @@ enum { typedef struct { char *title; - ETableModel *model; ESelectNamesModel *source; ESelectNamesTextModel *text_model; ESelectNames *names; @@ -836,7 +835,7 @@ static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESele { gtk_signal_disconnect_by_func (GTK_OBJECT (child->source), GTK_SIGNAL_FUNC (sync_table_and_models), e_select_names); g_free(child->title); - gtk_object_unref(GTK_OBJECT(child->model)); + gtk_object_unref(GTK_OBJECT(child->text_model)); gtk_object_unref(GTK_OBJECT(child->source)); g_free(key); } @@ -1104,11 +1103,11 @@ e_select_names_get_section(ESelectNames *e_select_names, char *id) child = g_hash_table_lookup(e_select_names->children, id); if (!child) return NULL; - rows = e_table_model_row_count(child->model); + rows = e_select_names_model_count (child->source); list = e_list_new(card_copy, card_free, NULL); for (i = 0; i < rows; i++) { - ECard *card = e_cardlist_model_get(E_CARDLIST_MODEL(child->model), i); + ECard *card = e_select_names_model_get_card (child->source, i); e_list_append(list, card); gtk_object_unref(GTK_OBJECT(card)); } |