aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/widgets
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2001-06-11 18:13:04 +0800
committerChris Lahey <clahey@src.gnome.org>2001-06-11 18:13:04 +0800
commit8b080c2358ad689f8a2d3fc2b0e98f966c4cccfb (patch)
treeab4598c70d3006cba0d895c205a45cae87d3ed67 /addressbook/gui/widgets
parent4b58038f453d5d84169611269e57160e65e9f569 (diff)
downloadgsoc2013-evolution-8b080c2358ad689f8a2d3fc2b0e98f966c4cccfb.tar.gz
gsoc2013-evolution-8b080c2358ad689f8a2d3fc2b0e98f966c4cccfb.tar.zst
gsoc2013-evolution-8b080c2358ad689f8a2d3fc2b0e98f966c4cccfb.zip
Added e-card-merging-book-commit-duplicate-detected.glade here.
2001-06-11 Christopher James Lahey <clahey@ximian.com> * 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
Diffstat (limited to 'addressbook/gui/widgets')
-rw-r--r--addressbook/gui/widgets/e-addressbook-table-adapter.c4
-rw-r--r--addressbook/gui/widgets/e-addressbook-util.c2
-rw-r--r--addressbook/gui/widgets/e-minicard.c9
3 files changed, 8 insertions, 7 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 9557046afe..38596fd0f0 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -136,8 +136,8 @@ addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
"card", &card,
NULL);
- e_book_commit_card(e_addressbook_model_get_ebook(priv->model),
- card, card_modified_cb, NULL);
+ e_card_merging_book_commit_card(e_addressbook_model_get_ebook(priv->model),
+ card, card_modified_cb, NULL);
/* XXX do we need this? shouldn't the commit_card generate a changed signal? */
e_table_model_cell_changed(etc, col, row);
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
index 6db628c412..c8ef417116 100644
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ b/addressbook/gui/widgets/e-addressbook-util.c
@@ -95,7 +95,7 @@ commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
EBook *book;
book = E_BOOK (data);
- e_book_commit_card (book, card, card_modified_cb, NULL);
+ e_card_merging_book_commit_card (book, card, card_modified_cb, NULL);
}
/* Callback for the delete_card signal from the contact editor */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 1627dd722a..d6cb8f0e1a 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -37,6 +37,7 @@
#include "e-minicard-label.h"
#include "e-minicard-view.h"
#include "e-contact-editor.h"
+#include "e-card-merging.h"
static void e_minicard_init (EMinicard *card);
static void e_minicard_class_init (EMinicardClass *klass);
@@ -479,10 +480,10 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
if (book) {
/* Add the card in the contact editor to our ebook */
- e_book_commit_card (book,
- e_minicard->card,
- card_modified_cb,
- NULL);
+ e_card_merging_book_commit_card (book,
+ e_minicard->card,
+ card_modified_cb,
+ NULL);
} else {
remodel(e_minicard);
e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_minicard));