diff options
| -rw-r--r-- | addressbook/ChangeLog | 14 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 48 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-table-adapter.c | 2 |
3 files changed, 12 insertions, 52 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index d698dd65f5..37960b585a 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2001-05-21 Chris Toshok <toshok@ximian.com> + + * gui/component/addressbook.c (change_view_type): update_view_type + is gone, since the menu item is gone. + + * gui/widgets/e-addressbook-table-adapter.c (create_card): use + e_table_model_rows_inserted here. + 2001-05-20 Christopher James Lahey <clahey@ximian.com> * gui/component/addressbook-config.c @@ -88,9 +96,9 @@ * gui/widgets/e-minicard-view-widget.h (struct _EMinicardViewWidgetClass): add selection_change signal. also, - add prototype for e_minicard_view_widget_selected_count. * - gui/widgets/e-addressbook-view.c - + add prototype for e_minicard_view_widget_selected_count. + + * gui/widgets/e-addressbook-view.c (e_addressbook_view_class_init): add our command_state_change signal. (e_addressbook_view_init): connect to the writable_status signal diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 8f3e07008d..7935bbf9ce 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -227,59 +227,13 @@ update_command_state (EAddressbookView *eav, AddressbookView *view) } static void -update_view_type (AddressbookView *view) -{ - BonoboUIComponent *uic = bonobo_control_get_ui_component (view->control); - EAddressbookViewType view_type; - - if (!uic || bonobo_ui_component_get_container (uic) == CORBA_OBJECT_NIL) - return; - - gtk_object_get (GTK_OBJECT (view->view), "type", &view_type, NULL); - - switch (view_type) { - case E_ADDRESSBOOK_VIEW_TABLE: - if (uic) - bonobo_ui_component_set_prop (uic, "/menu/View/AsTable", - "label", _("As _Minicards"), NULL); - - break; - case E_ADDRESSBOOK_VIEW_MINICARD: - if (uic) - bonobo_ui_component_set_prop (uic, "/menu/View/AsTable", - "label", _("As _Table"), NULL); - break; - default: - g_warning ("view_type must be either TABLE or MINICARD\n"); - return; - } -} - -static void change_view_type (AddressbookView *view, EAddressbookViewType view_type) { gtk_object_set (GTK_OBJECT (view->view), "type", view_type, NULL); - - update_view_type (view); -} - -static void -toggle_view_as_cb (BonoboUIComponent *uih, void *user_data, const char *path) -{ - AddressbookView *view = user_data; - EAddressbookViewType view_type; - - gtk_object_get (GTK_OBJECT (view->view), "type", &view_type, NULL); - - if (view_type == E_ADDRESSBOOK_VIEW_TABLE) - change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD); - else - change_view_type (view, E_ADDRESSBOOK_VIEW_TABLE); } BonoboUIVerb verbs [] = { BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb), - BONOBO_UI_UNSAFE_VERB ("ViewAsTable", toggle_view_as_cb), BONOBO_UI_UNSAFE_VERB ("ViewNewContact", new_contact_cb), BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb), @@ -327,8 +281,6 @@ control_activate (BonoboControl *control, e_addressbook_view_setup_menus (view->view, uic); - update_view_type (view); - e_pixmaps_update (uic, pixmaps); bonobo_ui_component_thaw (uic, NULL); diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index 01337bf8e3..4881615811 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -252,8 +252,8 @@ create_card (EAddressbookModel *model, for (i = 0; i < count; i ++) { priv->simples[index + i] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index + i)); gtk_object_ref (GTK_OBJECT (priv->simples[index + i])); - e_table_model_row_inserted (E_TABLE_MODEL (adapter), index + i); } + e_table_model_rows_inserted (E_TABLE_MODEL (adapter), index, count); } static void |