diff options
| author | Chris Toshok <toshok@ximian.com> | 2001-06-01 05:26:19 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2001-06-01 05:26:19 +0800 |
| commit | 6b6d9e32a4848b5fcb54ad83b681a828e6ed2a01 (patch) | |
| tree | 71b62a8f580774eaf90d24d65533f60b69b56072 /addressbook/gui/widgets/e-addressbook-view.c | |
| parent | e5ecf5d84ed197d93afd30fd1ce40384f01be09e (diff) | |
| download | gsoc2013-evolution-6b6d9e32a4848b5fcb54ad83b681a828e6ed2a01.tar gsoc2013-evolution-6b6d9e32a4848b5fcb54ad83b681a828e6ed2a01.tar.gz gsoc2013-evolution-6b6d9e32a4848b5fcb54ad83b681a828e6ed2a01.tar.bz2 gsoc2013-evolution-6b6d9e32a4848b5fcb54ad83b681a828e6ed2a01.tar.lz gsoc2013-evolution-6b6d9e32a4848b5fcb54ad83b681a828e6ed2a01.tar.xz gsoc2013-evolution-6b6d9e32a4848b5fcb54ad83b681a828e6ed2a01.tar.zst gsoc2013-evolution-6b6d9e32a4848b5fcb54ad83b681a828e6ed2a01.zip | |
decrement data_count before emitting the card_removed signal, and break
2001-05-31 Chris Toshok <toshok@ximian.com>
* gui/widgets/e-addressbook-model.c (remove_card): decrement
data_count before emitting the card_removed signal, and break
after we've removed the matching card.
(e_addressbook_model_class_init): change signature of
"card_removed" signal to match what we emit (and what is
expected.)
* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): the
signal name is "destroy", not "destroyed".
(do_remove): new function, actually remove the card.
(e_addressbook_view_delete_selection): get this working for both
view types.
svn path=/trunk/; revision=10071
Diffstat (limited to 'addressbook/gui/widgets/e-addressbook-view.c')
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 3491b8e662..f04c9c37c3 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -216,7 +216,7 @@ e_addressbook_view_init (EAddressbookView *eav) gtk_signal_connect (GTK_OBJECT(eav->invisible), "selection_received", GTK_SIGNAL_FUNC (selection_received), eav); - gtk_signal_connect (GTK_OBJECT(eav->invisible), "destroyed", + gtk_signal_connect (GTK_OBJECT(eav->invisible), "destroy", GTK_SIGNAL_FUNC (invisible_destroyed), eav); } @@ -1104,6 +1104,24 @@ card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data) g_print ("%s: %s(): a card was deleted\n", __FILE__, __FUNCTION__); } +static void +do_remove (int i, gpointer user_data) +{ + EBook *book; + ECard *card; + EAddressbookView *view = user_data; + + gtk_object_get (GTK_OBJECT(view->model), + "book", &book, + NULL); + + card = e_addressbook_model_get_card (view->model, i); + + e_book_remove_card(book, card, card_deleted_cb, NULL); + + gtk_object_unref (GTK_OBJECT (card)); +} + void e_addressbook_view_delete_selection(EAddressbookView *view) { @@ -1111,8 +1129,9 @@ e_addressbook_view_delete_selection(EAddressbookView *view) g_return_if_fail (model); - if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD) - e_minicard_view_widget_remove_selection (E_MINICARD_VIEW_WIDGET(view->object), card_deleted_cb, NULL); + e_selection_model_foreach (model, + do_remove, + view); } static void |