[empathy: 4/5] Access GdkDragContext members via getters

[Danielle Madeley <daniellem src gnome org>]

commit 468edbcfb17c5d67d945debf2f019dfd9974ccf9
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri Jun 11 17:51:39 2010 +1000

    Access GdkDragContext members via getters

 libempathy-gtk/empathy-avatar-chooser.c    |    8 +++++---
 libempathy-gtk/empathy-contact-list-view.c |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 6e6c283..7a39f65 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -725,7 +725,8 @@ avatar_chooser_drag_motion_cb (GtkWidget          *widget,
 
 	priv = GET_PRIV (chooser);
 
-	for (p = context->targets; p != NULL; p = p->next) {
+	for (p = gdk_drag_context_list_targets (context); p != NULL;
+	     p = p->next) {
 		gchar *possible_type;
 
 		possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
@@ -764,11 +765,12 @@ avatar_chooser_drag_drop_cb (GtkWidget          *widget,
 
 	priv = GET_PRIV (chooser);
 
-	if (context->targets == NULL) {
+	if (gdk_drag_context_list_targets (context) == NULL) {
 		return FALSE;
 	}
 
-	for (p = context->targets; p != NULL; p = p->next) {
+	for (p = gdk_drag_context_list_targets (context);
+	     p != NULL; p = p->next) {
 		char *possible_type;
 
 		possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 200524d..8d0cd78 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -448,7 +448,7 @@ contact_list_view_contact_drag_received (GtkWidget         *view,
 	data = g_slice_new0 (DndGetContactData);
 	data->new_group = new_group;
 	data->old_group = old_group;
-	data->action = context->action;
+	data->action = gdk_drag_context_get_selected_action (context);
 
 	/* FIXME: We should probably wait for the cb before calling
 	 * gtk_drag_finish */