diff options
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor-categories.c | 10 | ||||
| -rw-r--r-- | addressbook/gui/component/e-addressbook-model.c | 13 | ||||
| -rw-r--r-- | addressbook/gui/component/e-cardlist-model.c | 13 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-categories.c | 10 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-model.c | 13 |
6 files changed, 12 insertions, 53 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 93d7fc1de3..ea0932cfc4 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2000-06-12 Federico Mena Quintero <federico@helixcode.com> + + * contact-editor/e-contact-editor-categories.c: Removed the + ETableModel thaw handler. + * gui/component/e-cardlist-model.c: Likewise. + 2000-06-11 Christopher James Lahey <clahey@helixcode.com> * gui/component/e-select-names.c: Fixed the widget reparenting. diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c index 831fbce2b9..e58162a06a 100644 --- a/addressbook/contact-editor/e-contact-editor-categories.c +++ b/addressbook/contact-editor/e-contact-editor-categories.c @@ -42,7 +42,6 @@ static void *e_contact_editor_categories_duplicate_value (ETableModel *etc, int static void e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data); static void *e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data); static gboolean e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data); -static void e_contact_editor_categories_thaw (ETableModel *etc, gpointer data); static GnomeDialogClass *parent_class = NULL; @@ -275,7 +274,6 @@ e_contact_editor_categories_init (EContactEditorCategories *categories) e_contact_editor_categories_free_value, e_contact_editor_categories_initialize_value, e_contact_editor_categories_value_is_empty, - e_contact_editor_categories_thaw, categories); header = e_table_header_new(); @@ -456,11 +454,3 @@ e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const voi else return !(value && *(char *)value); } - -/* This function is for when the model is unfrozen. This can mostly - be ignored for simple models. */ -static void -e_contact_editor_categories_thaw (ETableModel *etc, gpointer data) -{ - e_table_model_changed(etc); -} diff --git a/addressbook/gui/component/e-addressbook-model.c b/addressbook/gui/component/e-addressbook-model.c index 5699ad0c00..f5d2fca7cb 100644 --- a/addressbook/gui/component/e-addressbook-model.c +++ b/addressbook/gui/component/e-addressbook-model.c @@ -102,8 +102,8 @@ addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val) "card", &card, NULL); e_book_commit_card(addressbook->book, card, NULL, NULL); - if ( !etc->frozen ) - e_table_model_cell_changed(etc, col, row); + + e_table_model_cell_changed(etc, col, row); } /* This function returns whether a particular cell is editable. */ @@ -139,14 +139,6 @@ addressbook_value_is_empty (ETableModel *etc, int col, const void *value) return !(value && *(char *)value); } -/* This function is for when the model is unfrozen. This can mostly - be ignored for simple models. */ -static void -addressbook_thaw (ETableModel *etc) -{ - e_table_model_changed(etc); -} - static void create_card(EBookView *book_view, const GList *cards, @@ -219,7 +211,6 @@ e_addressbook_model_class_init (GtkObjectClass *object_class) model_class->free_value = addressbook_free_value; model_class->initialize_value = addressbook_initialize_value; model_class->value_is_empty = addressbook_value_is_empty; - model_class->thaw = addressbook_thaw; } static void diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c index 032eb6c16c..e4a802439a 100644 --- a/addressbook/gui/component/e-cardlist-model.c +++ b/addressbook/gui/component/e-cardlist-model.c @@ -70,8 +70,8 @@ e_cardlist_model_set_value_at (ETableModel *etc, int col, int row, const void *v gtk_object_get(GTK_OBJECT(e_cardlist_model->data[row]), "card", &card, NULL); - if ( !etc->frozen ) - e_table_model_cell_changed(etc, col, row); + + e_table_model_cell_changed(etc, col, row); } /* This function returns whether a particular cell is editable. */ @@ -107,14 +107,6 @@ e_cardlist_model_value_is_empty (ETableModel *etc, int col, const void *value) return !(value && *(char *)value); } -/* This function is for when the model is unfrozen. This can mostly - be ignored for simple models. */ -static void -e_cardlist_model_thaw (ETableModel *etc) -{ - e_table_model_changed(etc); -} - void e_cardlist_model_add(ECardlistModel *model, ECard **cards, @@ -168,7 +160,6 @@ e_cardlist_model_class_init (GtkObjectClass *object_class) model_class->free_value = e_cardlist_model_free_value; model_class->initialize_value = e_cardlist_model_initialize_value; model_class->value_is_empty = e_cardlist_model_value_is_empty; - model_class->thaw = e_cardlist_model_thaw; } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c index 831fbce2b9..e58162a06a 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-categories.c +++ b/addressbook/gui/contact-editor/e-contact-editor-categories.c @@ -42,7 +42,6 @@ static void *e_contact_editor_categories_duplicate_value (ETableModel *etc, int static void e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data); static void *e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data); static gboolean e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data); -static void e_contact_editor_categories_thaw (ETableModel *etc, gpointer data); static GnomeDialogClass *parent_class = NULL; @@ -275,7 +274,6 @@ e_contact_editor_categories_init (EContactEditorCategories *categories) e_contact_editor_categories_free_value, e_contact_editor_categories_initialize_value, e_contact_editor_categories_value_is_empty, - e_contact_editor_categories_thaw, categories); header = e_table_header_new(); @@ -456,11 +454,3 @@ e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const voi else return !(value && *(char *)value); } - -/* This function is for when the model is unfrozen. This can mostly - be ignored for simple models. */ -static void -e_contact_editor_categories_thaw (ETableModel *etc, gpointer data) -{ - e_table_model_changed(etc); -} diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 5699ad0c00..f5d2fca7cb 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -102,8 +102,8 @@ addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val) "card", &card, NULL); e_book_commit_card(addressbook->book, card, NULL, NULL); - if ( !etc->frozen ) - e_table_model_cell_changed(etc, col, row); + + e_table_model_cell_changed(etc, col, row); } /* This function returns whether a particular cell is editable. */ @@ -139,14 +139,6 @@ addressbook_value_is_empty (ETableModel *etc, int col, const void *value) return !(value && *(char *)value); } -/* This function is for when the model is unfrozen. This can mostly - be ignored for simple models. */ -static void -addressbook_thaw (ETableModel *etc) -{ - e_table_model_changed(etc); -} - static void create_card(EBookView *book_view, const GList *cards, @@ -219,7 +211,6 @@ e_addressbook_model_class_init (GtkObjectClass *object_class) model_class->free_value = addressbook_free_value; model_class->initialize_value = addressbook_initialize_value; model_class->value_is_empty = addressbook_value_is_empty; - model_class->thaw = addressbook_thaw; } static void |