diff options
author | Hans Petter Jansson <hpj@ximian.com> | 2004-06-24 06:40:24 +0800 |
---|---|---|
committer | Hans Petter <hansp@src.gnome.org> | 2004-06-24 06:40:24 +0800 |
commit | 54a5d78f7876c7ebbe6e973a7d0321efb48128e0 (patch) | |
tree | c4cf1430105eddc54c3ea70e5aee7648e1effac6 /addressbook/gui/widgets/e-minicard-view.c | |
parent | 00fc3d7f480b020e90de31894f575c54dd78a034 (diff) | |
download | gsoc2013-evolution-54a5d78f7876c7ebbe6e973a7d0321efb48128e0.tar gsoc2013-evolution-54a5d78f7876c7ebbe6e973a7d0321efb48128e0.tar.gz gsoc2013-evolution-54a5d78f7876c7ebbe6e973a7d0321efb48128e0.tar.bz2 gsoc2013-evolution-54a5d78f7876c7ebbe6e973a7d0321efb48128e0.tar.lz gsoc2013-evolution-54a5d78f7876c7ebbe6e973a7d0321efb48128e0.tar.xz gsoc2013-evolution-54a5d78f7876c7ebbe6e973a7d0321efb48128e0.tar.zst gsoc2013-evolution-54a5d78f7876c7ebbe6e973a7d0321efb48128e0.zip |
Add an x-source-vcard target entry that includes the source book URI.
2004-06-23 Hans Petter Jansson <hpj@ximian.com>
* gui/component/addressbook-view.c: Add an x-source-vcard target entry
that includes the source book URI.
(destroy_merge_context): Implement.
(removed_contact_cb): Implement.
(merged_contact_cb): Implement.
(selector_tree_drag_data_received): Get the source and target books,
and see if we need to remove contacts from source after they're added
to target. Copy contacts sequentially, not in parallel, with a
callback.
* gui/widgets/e-addressbook-view.c: Add an x-source-vcard target entry
that includes the source book URI.
(table_drag_data_delete): Remove. This is handled by the drag target.
(table_drag_data_get): Handle more than one contact. Supply source.
(create_table_view): Don't connect to the delete signal.
* gui/widgets/e-minicard-view.c: Add an x-source-vcard target entry
that includes the source book URI.
(e_minicard_view_drag_data_delete): Remove. This is handled by the
drag target.
(e_minicard_view_drag_data_get): Handle x-source-vcard target.
(e_minicard_view_drag_begin): Don't connect to the delete signal.
(e_minicard_view_dispose): Don't disconnect from the delete signal.
(e_minicard_view_init): Don't init delete_id.
* gui/widgets/e-minicard-view.h: Remove delete_id from struct.
* util/eab-book-util.[ch] (eab_contact_list_from_string): Skip the
source URI if present.
(eab_book_and_contact_list_from_string): Create the source book from
the provided URI, if present.
(eab_book_and_contact_list_to_string): Include the book URI in
generated string.
svn path=/trunk/; revision=26485
Diffstat (limited to 'addressbook/gui/widgets/e-minicard-view.c')
-rw-r--r-- | addressbook/gui/widgets/e-minicard-view.c | 50 |
1 files changed, 14 insertions, 36 deletions
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 60893d45f1..6cae674c98 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -62,9 +62,12 @@ static guint signals [LAST_SIGNAL] = {0, }; enum DndTargetType { DND_TARGET_TYPE_VCARD_LIST, + DND_TARGET_TYPE_SOURCE_VCARD_LIST }; #define VCARD_LIST_TYPE "text/x-vcard" +#define SOURCE_VCARD_LIST_TYPE "text/x-source-vcard" static GtkTargetEntry drag_types[] = { + { SOURCE_VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_SOURCE_VCARD_LIST }, { VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST } }; static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]); @@ -92,32 +95,19 @@ e_minicard_view_drag_data_get(GtkWidget *widget, value, strlen (value)); break; } - } -} - -static void -e_minicard_view_drag_data_delete (GtkWidget *widget, - GdkDragContext *context, - EMinicardView *view) -{ - EBook *book; - GList *l; - - if (!E_IS_MINICARD_VIEW (view)) - return; + case DND_TARGET_TYPE_SOURCE_VCARD_LIST: { + EBook *book; + char *value; + + g_object_get (view->adapter, "book", &book, NULL); + value = eab_book_and_contact_list_to_string (book, view->drag_list); - if (!view->drag_list) { - g_warning ("e_minicard_view_drag_data_delete called without contact list"); - return; + gtk_selection_data_set (selection_data, + selection_data->target, + 8, + value, strlen (value)); + break; } - - g_object_get (view->adapter, "book", &book, NULL); - - for (l = view->drag_list; l; l = g_list_next (l)) { - EContact *contact = l->data; - - /* XXX no callback */ - e_book_async_remove_contact (book, contact, NULL, NULL); } } @@ -152,11 +142,6 @@ e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, "drag_data_get", G_CALLBACK (e_minicard_view_drag_data_get), view); - if (!view->canvas_drag_data_delete_id) - view->canvas_drag_data_delete_id = g_signal_connect (GNOME_CANVAS_ITEM (view)->canvas, - "drag_data_delete", - G_CALLBACK (e_minicard_view_drag_data_delete), - view); gtk_drag_set_icon_default (context); @@ -314,12 +299,6 @@ e_minicard_view_dispose (GObject *object) view->canvas_drag_data_get_id = 0; } - if (view->canvas_drag_data_delete_id) { - g_signal_handler_disconnect (GNOME_CANVAS_ITEM (view)->canvas, - view->canvas_drag_data_delete_id); - view->canvas_drag_data_delete_id = 0; - } - if (view->adapter) { if (view->writable_status_id) { EABModel *model; @@ -545,7 +524,6 @@ e_minicard_view_init (EMinicardView *view) view->drag_list = NULL; view->adapter = NULL; view->canvas_drag_data_get_id = 0; - view->canvas_drag_data_delete_id = 0; view->writable_status_id = 0; set_empty_message (view); |