Merge back from master

[empathy.git] / libempathy-gtk / empathy-contact-list-view.c

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 2ff27b1305eedf72eff1cf09c234bca0eac94d25..dcbbb18bf57ffccf276ed544ef5c21e8b24ed02e 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -364,6 +364,7 @@ contact_list_view_drag_motion (GtkWidget      *widget,
        gboolean               is_row;
        gboolean               is_different = FALSE;
        gboolean               cleanup = TRUE;
+       int                    action = 0;
 
        is_row = gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
                                                x,
@@ -382,6 +383,13 @@ contact_list_view_drag_motion (GtkWidget      *widget,
                cleanup &= FALSE;
        }
 
+       if (context->actions == GDK_ACTION_COPY) {
+               action = context->suggested_action;
+       } else if (context->actions & GDK_ACTION_MOVE) {
+               action = GDK_ACTION_MOVE;
+       }
+       gdk_drag_status (context, action, time);
+
        if (!is_different && !cleanup) {
                return TRUE;
        }