[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.378,1.379 gtkimhtml.h,1.96,1.97

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11811/src

Modified Files:
	gtkimhtml.c gtkimhtml.h 
Log Message:
Patch 1078151 from Felipe Contreras to fix some more MSN bugs:

"User Dislpay messages, and other less used, did not set
 an slpcall, so the callback that should not be called,
 was called (in some very special cases)."
...
"Here it goes the real real one, as far as I can tell.
 Cleaning + organizing + documentation + hard bug fix = big
 patch." -- Felipe Contreras

I also fixed drag-and-drop to conversation window file transfers (which
I had broken when I fixed some other dnd thing), made the debug output
of the autoreconnect plugin more useful, and stopped the message
notification plugin notifying you for messages sent by ignored users.



Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -d -p -r1.378 -r1.379
--- gtkimhtml.c	2 Dec 2004 20:34:17 -0000	1.378
+++ gtkimhtml.c	11 Dec 2004 20:01:57 -0000	1.379
@@ -1350,6 +1350,9 @@ gtk_imhtml_link_drag_rcv_cb(GtkWidget *w
 					/* Ignore blank lines */
 				} else {
 					/* Special reasons, aka images being put in via other tag, etc. */
+					/* ... don't pretend we handled it if we didn't */
+					gtk_drag_finish(dc, FALSE, FALSE, t);
+					return;
 				}
 			}
 			break;

Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -p -r1.96 -r1.97
--- gtkimhtml.h	23 Nov 2004 02:22:24 -0000	1.96
+++ gtkimhtml.h	11 Dec 2004 20:01:57 -0000	1.97
@@ -200,11 +200,11 @@ enum {
 };
 
 #define GTK_IMHTML_DND_TARGETS	\
+	{ "text/uri-list", 0, GTK_IMHTML_DRAG_URL }, \
 	{ "_NETSCAPE_URL", 0, GTK_IMHTML_DRAG_URL }, \
 	{ "text/html", 0, GTK_IMHTML_DRAG_HTML }, \
 	{ "x-url/ftp", 0, GTK_IMHTML_DRAG_URL }, \
 	{ "x-url/http", 0, GTK_IMHTML_DRAG_URL }, \
-	{ "text/uri-list", 0, GTK_IMHTML_DRAG_URL }, \
 	{ "UTF8_STRING", 0, GTK_IMHTML_DRAG_UTF8_STRING }, \
 	{ "COMPOUND_TEXT", 0, GTK_IMHTML_DRAG_COMPOUND_TEXT }, \
 	{ "STRING", 0, GTK_IMHTML_DRAG_STRING }, \