]> git.0d.be Git - empathy.git/commitdiff
Access GdkDragContext members via getters
authorDanielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 11 Jun 2010 07:51:39 +0000 (17:51 +1000)
committerDanielle Madeley <danielle.madeley@collabora.co.uk>
Sat, 12 Jun 2010 00:07:20 +0000 (10:07 +1000)
libempathy-gtk/empathy-avatar-chooser.c
libempathy-gtk/empathy-contact-list-view.c

index 6e6c2831049d3fc751aade43a097a93e403b7ba8..7a39f65f1b27a70b5b52fa966971b3e553c2d5aa 100644 (file)
@@ -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));
index 200524d2548aaa46192afbe31cf9d8c7aa131473..8d0cd784fbcbabb7277f418981b2019408d50c51 100644 (file)
@@ -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 */