diff options
| -rw-r--r-- | addressbook/ChangeLog | 10 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 8 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-model.c | 6 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-model.h | 2 |
4 files changed, 24 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 633d0da04f..a55bf61107 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,13 @@ +2001-10-21 Jon Trowbridge <trow@ximian.com> + + * gui/component/addressbook.c (control_activate_cb): Call + e_addressbook_model_force_folder_bar_message when we activate the + component. (Fixes bug #11749) + + * gui/widgets/e-addressbook-model.c + (e_addressbook_model_force_folder_bar_message): Added. Forces + emission of a folder_bar_message. + 2001-10-20 Larry Ewing <lewing@ximian.com> * gui/component/select-names/e-select-names.c diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 41b2ff7396..c9f2693997 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -387,9 +387,13 @@ control_activate_cb (BonoboControl *control, uic = bonobo_control_get_ui_component (control); g_assert (uic != NULL); - if (activate) + if (activate) { + control_activate (control, uic, view); - else { + if (activate && view->view && view->view->model) + e_addressbook_model_force_folder_bar_message (view->view->model); + + } else { bonobo_ui_component_unset_container (uic); e_addressbook_view_discard_menus (view->view); } diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index e43d9e5ec6..cd7688ba51 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -547,6 +547,12 @@ e_addressbook_model_can_stop (EAddressbookModel *model) return model->search_in_progress; } +void +e_addressbook_model_force_folder_bar_message (EAddressbookModel *model) +{ + update_folder_bar_message (model); +} + int e_addressbook_model_card_count (EAddressbookModel *model) { diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index 3bd66ca46f..6482409075 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -66,6 +66,8 @@ EBook *e_addressbook_model_get_ebook (EAddressbookModel *model); void e_addressbook_model_stop (EAddressbookModel *model); gboolean e_addressbook_model_can_stop (EAddressbookModel *model); +void e_addressbook_model_force_folder_bar_message (EAddressbookModel *model); + int e_addressbook_model_card_count (EAddressbookModel *model); ECard *e_addressbook_model_card_at (EAddressbookModel *model, int index); gboolean e_addressbook_model_editable (EAddressbookModel *model); |