Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jabber.c	Thu Oct 03 01:33:59 2013 +0530
+++ b/libpurple/protocols/jabber/jabber.c	Thu Oct 03 02:08:55 2013 +0530
@@ -596,7 +596,7 @@
 	if (NULL == packet)
 		return;
 
-	g_return_if_fail(PURPLE_IS_CONNECTION(pc));
+	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(pc));
 
 	js = purple_connection_get_protocol_data(pc);
 
@@ -651,7 +651,7 @@
 	static char buf[4096];
 
 	/* TODO: It should be possible to make this check unnecessary */
-	if(!PURPLE_IS_CONNECTION(gc)) {
+	if(!PURPLE_CONNECTION_IS_VALID(gc)) {
 		purple_ssl_close(gsc);
 		g_return_if_reached();
 	}
@@ -688,7 +688,7 @@
 	int len;
 	static char buf[4096];
 
-	g_return_if_fail(PURPLE_IS_CONNECTION(gc));
+	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
 
 	if((len = read(js->fd, buf, sizeof(buf) - 1)) > 0) {
 		purple_connection_update_last_received(gc);
@@ -746,7 +746,7 @@
 	JabberStream *js;
 
 	/* TODO: It should be possible to make this check unnecessary */
-	if(!PURPLE_IS_CONNECTION(gc)) {
+	if(!PURPLE_CONNECTION_IS_VALID(gc)) {
 		purple_ssl_close(gsc);
 		g_return_if_reached();
 	}
@@ -842,7 +842,7 @@
 	JabberStream *js;
 
 	/* If the connection is already disconnected, we don't need to do anything else */
-	g_return_if_fail(PURPLE_IS_CONNECTION(gc));
+	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
 
 	js = purple_connection_get_protocol_data(gc);
 	js->gsc = NULL;