diff options
| author | Devashish Sharma <dsharma@src.gnome.org> | 2006-06-15 17:59:55 +0800 |
|---|---|---|
| committer | Devashish Sharma <dsharma@src.gnome.org> | 2006-06-15 17:59:55 +0800 |
| commit | d14fff52f92786d96ae9619d8f5df054812db796 (patch) | |
| tree | e8f2e4880abb682f15ee1ac4e9ed9371ca94e8ca | |
| parent | 48961a210f27e0f3bf1a08fa6287f67151e721a5 (diff) | |
| download | gsoc2013-evolution-d14fff52f92786d96ae9619d8f5df054812db796.tar gsoc2013-evolution-d14fff52f92786d96ae9619d8f5df054812db796.tar.gz gsoc2013-evolution-d14fff52f92786d96ae9619d8f5df054812db796.tar.bz2 gsoc2013-evolution-d14fff52f92786d96ae9619d8f5df054812db796.tar.lz gsoc2013-evolution-d14fff52f92786d96ae9619d8f5df054812db796.tar.xz gsoc2013-evolution-d14fff52f92786d96ae9619d8f5df054812db796.tar.zst gsoc2013-evolution-d14fff52f92786d96ae9619d8f5df054812db796.zip | |
Fix for Bug #337085 and 337086.
svn path=/trunk/; revision=32146
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-view.c | 14 |
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 */ |