diff src/gtkconv.c @ 10145:4d484e455839

[gaim-migrate @ 11218] This fixes the crash / hang / strangeness when dragging a buddy to a conversation entry thing. Also fixes a minor memory leak with old plugins. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 26 Oct 2004 01:00:35 +0000
parents d520ab74fe8f
children 3f71f7282dbf
line wrap: on
line diff
--- a/src/gtkconv.c	Mon Oct 25 23:45:26 2004 +0000
+++ b/src/gtkconv.c	Tue Oct 26 01:00:35 2004 +0000
@@ -4505,8 +4505,10 @@
 		/* XXX - Attempt to load this file into gdk_pixbuf, or otherwise determine if it is an image.  If it is, offer
 		 * the choice of a) sending this file b) inserting this file as an IM image or c) setting this file as a custom
 		 * buddy icon for this buddy */
+		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
-	gtk_drag_finish(dc, FALSE, FALSE, t);
+	else
+		gtk_drag_finish(dc, FALSE, FALSE, t);
 }
 
 /**************************************************************************
@@ -4637,11 +4639,9 @@
 
 static const GtkTargetEntry te[] =
 {
-	{"text/uri-list", 0, 0},
-	{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, 1},
-	{"text/plain", 0, 2},
-	{"STRING", 0, 3},
-	{"application/x-im-contact", 0, 4}
+	GTK_IMHTML_DND_TARGETS,
+	{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, GTK_IMHTML_DRAG_NUM},
+	{"application/x-im-contact", 0, GTK_IMHTML_DRAG_NUM + 1}
 };
 
 static void