pidgin: a2e08aee: Make this function match read_cb() in se...

markdoliner at pidgin.im markdoliner at pidgin.im
Fri Nov 14 22:20:21 EST 2008


-----------------------------------------------------------------
Revision: a2e08aeee42341edca8ebca7236372421b315a2e
Ancestor: 58d0133e75e2712cf100a12d194be308dde1b4db
Author: markdoliner at pidgin.im
Date: 2008-11-15T03:17:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a2e08aeee42341edca8ebca7236372421b315a2e

Modified files:
        libpurple/protocols/msn/httpconn.c

ChangeLog: 

Make this function match read_cb() in servconn.c.  The bottom halves of
these two function should probably share the same code, since they're
exactly the same.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/httpconn.c	71acf4240cd70d2bc9a1e8589efd339dad506568
+++ libpurple/protocols/msn/httpconn.c	0544210f4c50b355e675bf2885e1b83e913f9cdb
@@ -379,9 +379,9 @@ read_cb(gpointer data, gint source, Purp
 			msn_cmdproc_process_cmd_text(servconn->cmdproc, cur);
 			servconn->payload_len = servconn->cmdproc->last_cmd->payload_len;
 		}
-	} while (servconn->connected && servconn->rx_len > 0);
+	} while (servconn->connected && !servconn->wasted && servconn->rx_len > 0);
 
-	if (servconn->connected)
+	if (servconn->connected && !servconn->wasted)
 	{
 		if (servconn->rx_len > 0)
 			servconn->rx_buf = g_memdup(cur, servconn->rx_len);


More information about the Commits mailing list