summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSulabh Mahajan <sulabh@pidgin.im>2008-11-14 08:08:59 +0000
committerSulabh Mahajan <sulabh@pidgin.im>2008-11-14 08:08:59 +0000
commit5844be48b3e559b5ed603ea79803dd3045094f33 (patch)
tree28452332bbaa5c3329e633ed2eec48bb0e0c37ad
parent8d32de7b4c06a0c5be559a361e34cd53b57c1e25 (diff)
downloadpidgin-5844be48b3e559b5ed603ea79803dd3045094f33.tar.gz
remove connection timeout if already connected
-rw-r--r--libpurple/protocols/yahoo/yahoo.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libpurple/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/yahoo.c
index 2d2771566f..dea82844b6 100644
--- a/libpurple/protocols/yahoo/yahoo.c
+++ b/libpurple/protocols/yahoo/yahoo.c
@@ -2597,6 +2597,10 @@ static void yahoo_p2p_server_send_connected_cb(gpointer data, gint source, Purpl
return;
}
+ /* remove timeout */
+ purple_timeout_remove(yd->yahoo_p2p_server_timeout_handle);
+ yd->yahoo_p2p_server_timeout_handle = 0;
+
/* remove watcher and close p2p server */
purple_input_remove(yd->yahoo_p2p_server_watcher);
close(yd->yahoo_local_p2p_server_fd);