pidgin: 5c5ae1b7: Always save the MSN transaction in each ...

qulogic at pidgin.im qulogic at pidgin.im
Thu Jul 17 01:30:48 EDT 2008


-----------------------------------------------------------------
Revision: 5c5ae1b7efa28d9a5b76a5be3b0888149b8b0ab2
Ancestor: c7cd6a4c341ff512ad7adad3fe410b621991aed9
Author: qulogic at pidgin.im
Date: 2008-07-17T03:23:59
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5c5ae1b7efa28d9a5b76a5be3b0888149b8b0ab2

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

ChangeLog: 

Always save the MSN transaction in each command, not just for 
synchronous ones. Apparently, "URL" may or may not be async, but we 
also send it ourselves, too, and we need the transaction for other 
things.

References #5762.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/cmdproc.c	e3d66bb017e97382b6b24b2ef4cbb8a1eb6db158
+++ libpurple/protocols/msn/cmdproc.c	af0cf762cdce653bb98d968b8159bc8ff0f3ead8
@@ -263,7 +263,7 @@ msn_cmdproc_process_cmd(MsnCmdProc *cmdp
 	MsnTransaction *trans = NULL;
 
 	if (cmd->trId)
-		trans = msn_history_find(cmdproc->history, cmd->trId);
+		cmd->trans = trans = msn_history_find(cmdproc->history, cmd->trId);
 
 	if (trans != NULL)
 		if (trans->timer) {
@@ -309,8 +309,6 @@ msn_cmdproc_process_cmd(MsnCmdProc *cmdp
 
 	if (cb == NULL && trans != NULL)
 	{
-		cmd->trans = trans;
-
 		if (trans->callbacks != NULL)
 			cb = g_hash_table_lookup(trans->callbacks, cmd->command);
 	}


More information about the Commits mailing list