aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.c8
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 6e6c28310..7a39f65f1 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 200524d25..8d0cd784f 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 */