From 8b080c2358ad689f8a2d3fc2b0e98f966c4cccfb Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 11 Jun 2001 10:13:04 +0000 Subject: Added e-card-merging-book-commit-duplicate-detected.glade here. 2001-06-11 Christopher James Lahey * gui/merging/Makefile.am (glade_DATA): Added e-card-merging-book-commit-duplicate-detected.glade here. * gui/merging/e-card-merging-book-commit-duplicate-detected.glade: Added this file. The GUI for asking whether to commit a modified card. * gui/merging/e-card-merging.c, gui/merging/e-card-merging.h (e_card_merging_book_commit_card): Added this function. * gui/widgets/e-addressbook-table-adapter.c (addressbook_set_value_at), gui/widgets/e-addressbook-util.c (commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use e_card_merging_book_commit_card instead of e_book_commit_card here. svn path=/trunk/; revision=10184 --- addressbook/ChangeLog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'addressbook/ChangeLog') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5ee4ba0c17..7c6f0b5b18 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,20 @@ +2001-06-11 Christopher James Lahey + + * gui/merging/Makefile.am (glade_DATA): Added + e-card-merging-book-commit-duplicate-detected.glade here. + + * gui/merging/e-card-merging-book-commit-duplicate-detected.glade: + Added this file. The GUI for asking whether to commit a modified + card. + + * gui/merging/e-card-merging.c, gui/merging/e-card-merging.h + (e_card_merging_book_commit_card): Added this function. + + * gui/widgets/e-addressbook-table-adapter.c + (addressbook_set_value_at), gui/widgets/e-addressbook-util.c + (commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use + e_card_merging_book_commit_card instead of e_book_commit_card here. + 2001-06-11 Christopher James Lahey * backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h: -- cgit