# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1239838338 0
# Node ID 332d967670e09b2b9c2d10077aa50118d4439b7b
# Parent  ba99ee5199261551504ceb15c760b81f478a1ced# Parent  3712d32363ddef68256ec5919dd8889b31c31072
propagate from branch 'im.pidgin.pidgin' (head 58fbcc161c5eadf3f307cd460a6ce0a209d908df)
            to branch 'org.darkrain42.pidgin.disco' (head 0a29ca89a8dbe84c8b4d4631185db447391c375f)

diff -r ba99ee519926 -r 332d967670e0 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Wed Apr 15 06:57:48 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Wed Apr 15 23:32:18 2009 +0000
@@ -463,7 +463,7 @@
 	JabberStream *js = gc->proto_data;
 
 	if (js->keepalive_timeout == -1) {
-		jabber_ping_jid(js, NULL);
+		jabber_ping_jid(js, js->user->domain);
 		js->keepalive_timeout = purple_timeout_add_seconds(120,
 				(GSourceFunc)(jabber_keepalive_timeout), gc);
 	}
diff -r ba99ee519926 -r 332d967670e0 libpurple/protocols/jabber/ping.c
--- a/libpurple/protocols/jabber/ping.c	Wed Apr 15 06:57:48 2009 +0000
+++ b/libpurple/protocols/jabber/ping.c	Wed Apr 15 23:32:18 2009 +0000
@@ -55,15 +55,10 @@
                                   JabberIqType type, const char *id,
                                   xmlnode *packet, gpointer data)
 {
-	char *own_bare_jid = g_strdup_printf("%s@%s", js->user->node,
-	                                     js->user->domain);
-
-	if (!from || !strcmp(from, own_bare_jid)) {
-		/* If the pong is from our bare JID, treat it as a return from the
+	if (purple_strequal(from, js->user->domain))
+		/* If the pong is from the server, assume it's a result of the
 		 * keepalive functions */
 		jabber_keepalive_pong_cb(js);
-	}
-	g_free(own_bare_jid);
 
 	if (type == JABBER_IQ_RESULT) {
 		purple_debug_info("jabber", "PONG!\n");
diff -r ba99ee519926 -r 332d967670e0 libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Wed Apr 15 06:57:48 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Wed Apr 15 23:32:18 2009 +0000
@@ -2973,8 +2973,10 @@
 
 		/* connect to host */
 		if((purple_proxy_connect(NULL, account, host_ip, YAHOO_PAGER_PORT_P2P, yahoo_p2p_init_cb, p2p_data))==NULL)	{
-			yahoo_p2p_disconnect_destroy_data(p2p_data);
 			purple_debug_info("yahoo","p2p: Connection to %s failed\n", host_ip);
+			g_free(p2p_data->host_ip);
+			g_free(p2p_data->host_username);
+			g_free(p2p_data);
 		}
 	}
 }