aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-view.c14
2 files changed, 11 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 235a44ca36..7df8205330 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-15 Devashish Sharma <sdevashish@novell.com>
+
+ * gui/component/addressbook-view.c : Drag-n-drop contacts now
+ defaults to Moving the contact and the contacts moved will be
+ instantly removed from the source addressbook.
+ Fixes Bug #337085 and #337086
+
2006-06-14 Hiroyuki Ikezoe <poincare@ikezoe.net>
** Fixes bug #344227
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index fbbe9628c1..d6da6a09cc 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -1193,15 +1193,9 @@ selector_tree_drag_data_received (GtkWidget *widget,
eab_book_and_contact_list_from_string (data->data, &source_book, &contactlist);
- if (source_book) {
- if (!e_book_open (source_book, FALSE, NULL)) {
- g_warning (G_STRLOC ": Couldn't open source EBook.");
- g_object_unref (source_book);
- source_book = NULL;
- }
- } else {
- g_warning (G_STRLOC ": No source EBook provided.");
- }
+ AddressbookView *view = (AddressbookView *) user_data;
+ EABView *v = get_current_view (view);
+ g_object_get (v->model, "book",&source_book, NULL);
/* Set up merge context */
@@ -1213,7 +1207,7 @@ selector_tree_drag_data_received (GtkWidget *widget,
merge_context->current_contact = contactlist->data;
merge_context->remaining_contacts = g_list_delete_link (contactlist, contactlist);
- merge_context->remove_from_source = context->suggested_action == GDK_ACTION_MOVE ? TRUE : FALSE;
+ merge_context->remove_from_source = context->suggested_action == GDK_ACTION_MOVE ? FALSE : TRUE;
/* Start merge */