pidgin: 561a0cd5: Fix two errors when my p2p server connec...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Wed Jul 8 13:05:36 EDT 2009


-----------------------------------------------------------------
Revision: 561a0cd5c9ec8e05c85303e72e406b03240527ed
Ancestor: f9aa1dca409f04b4b4b08f8fcbc7cb1478ca4aee
Author: darkrain42 at pidgin.im
Date: 2009-07-08T16:51:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/561a0cd5c9ec8e05c85303e72e406b03240527ed

Modified files:
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

Fix two errors when my p2p server connection times out.

(08:49:31) yahoo: yahoo p2p server timeout, peer failed to connect(08:49:31) GLib: g_source_remove: assertion `tag > 0' failed

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/libymsg.c	6b798aab2b884c129bf8c912234defaa54d059ac
+++ libpurple/protocols/yahoo/libymsg.c	9182115b07953da067feec10752961a03e67012a
@@ -2239,7 +2239,8 @@ static void yahoo_p2p_disconnect_destroy
 
 	if(p2p_data->source >= 0)
 		close(p2p_data->source);
-	purple_input_remove(p2p_data->input_event);
+	if (p2p_data->input_event > 0)
+		purple_input_remove(p2p_data->input_event);
 	g_free(p2p_data->host_ip);
 	g_free(p2p_data->host_username);
 	g_free(p2p_data);
@@ -2459,7 +2460,7 @@ static gboolean yahoo_cancel_p2p_server_
 
 	yd = p2p_data->gc->proto_data;
 
-	purple_debug_warning("yahoo","yahoo p2p server timeout, peer failed to connect");
+	purple_debug_warning("yahoo","yahoo p2p server timeout, peer failed to connect\n");
 	yahoo_p2p_disconnect_destroy_data(data);
 	purple_input_remove(yd->yahoo_p2p_server_watcher);
 	yd->yahoo_p2p_server_watcher = 0;


More information about the Commits mailing list