[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.117,1.118

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv464/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
Better support for Jabber resources by Jim Seymour


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- oscar.c	15 Mar 2002 00:56:15 -0000	1.117
+++ oscar.c	15 Mar 2002 20:09:14 -0000	1.118
@@ -3172,7 +3172,10 @@
 	
 	if (!(dim = find_direct_im(od, sn)))
 		return 1;
-	gaim_input_remove(dim->watcher);   /* Otherwise, the callback will callback */
+	if (dim->watcher) {
+		gaim_input_remove(dim->watcher);   /* Otherwise, the callback will callback */
+		dim->watcher = 0;
+	}
 	while (gtk_events_pending())
 		gtk_main_iteration();