[empathy] Accept text/plain drops as file transfers, rather than as Individuals
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Accept text/plain drops as file transfers, rather than as Individuals
- Date: Fri, 27 Aug 2010 09:27:17 +0000 (UTC)
commit 5e9eff1788ca0344be6cb09a304a89add7002248
Author: Philip Withnall <philip withnall collabora co uk>
Date: Wed Aug 25 12:34:35 2010 +0100
Accept text/plain drops as file transfers, rather than as Individuals
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 9ef9c10..b8365d1 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] &&
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]