diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-25 19:34:35 +0800 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-08-27 17:23:49 +0800 |
| commit | 5e9eff1788ca0344be6cb09a304a89add7002248 (patch) | |
| tree | 7e4ffeb619161a4529f79c7fbdf8dbc47f5785ac /libempathy-gtk | |
| parent | 8c812cfbd960392d2acee585c3d7d3030d3e3fa8 (diff) | |
| download | gsoc2013-empathy-5e9eff1788ca0344be6cb09a304a89add7002248.tar gsoc2013-empathy-5e9eff1788ca0344be6cb09a304a89add7002248.tar.gz gsoc2013-empathy-5e9eff1788ca0344be6cb09a304a89add7002248.tar.bz2 gsoc2013-empathy-5e9eff1788ca0344be6cb09a304a89add7002248.tar.lz gsoc2013-empathy-5e9eff1788ca0344be6cb09a304a89add7002248.tar.xz gsoc2013-empathy-5e9eff1788ca0344be6cb09a304a89add7002248.tar.zst gsoc2013-empathy-5e9eff1788ca0344be6cb09a304a89add7002248.zip | |
Accept text/plain drops as file transfers, rather than as Individuals
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 9ef9c103a..b8365d175 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -511,8 +511,7 @@ individual_view_drag_data_received (GtkWidget *view, { success = FALSE; } - else if (info == DND_DRAG_TYPE_INDIVIDUAL_ID - || info == DND_DRAG_TYPE_STRING) + else if (info == DND_DRAG_TYPE_INDIVIDUAL_ID) { success = individual_view_individual_drag_received (view, context, model, path, selection); @@ -522,7 +521,7 @@ individual_view_drag_data_received (GtkWidget *view, success = individual_view_persona_drag_received (view, context, model, path, selection); } - else if (info == DND_DRAG_TYPE_URI_LIST) + else if (info == DND_DRAG_TYPE_URI_LIST || info == DND_DRAG_TYPE_STRING) { success = individual_view_file_drag_received (view, context, model, path, selection); @@ -639,8 +638,7 @@ individual_view_drag_motion (GtkWidget *widget, if (individual != NULL) g_object_unref (individual); } - else if (((target == drag_atoms_dest[DND_DRAG_TYPE_STRING] || - target == drag_atoms_dest[DND_DRAG_TYPE_INDIVIDUAL_ID]) && + else if ((target == drag_atoms_dest[DND_DRAG_TYPE_INDIVIDUAL_ID] && (priv->view_features & EMPATHY_INDIVIDUAL_VIEW_FEATURE_GROUPS_CHANGE || priv->drag_row == NULL)) || (target == drag_atoms_dest[DND_DRAG_TYPE_PERSONA_ID] && |