diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 00:37:48 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 00:37:48 +0800 |
| commit | 84e30dab1428affe335ef904377d07f8b5fdeb66 (patch) | |
| tree | fee9c8ec124a2b5804f6bb4ee31772db56a6e374 /libempathy-gtk/empathy-contact-list-view.c | |
| parent | fd8e9c5dc2584055177c7a79021cdd53ca431c22 (diff) | |
| parent | 3803736b4326d4bc00d58ccd25f910907f0b4521 (diff) | |
| download | gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.gz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.bz2 gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.lz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.xz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.zst gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.zip | |
Merge back from master
Diffstat (limited to 'libempathy-gtk/empathy-contact-list-view.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-view.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 2ff27b130..dcbbb18bf 100644 --- 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; } |