Revision c421cb45747955754775d5b2884141dc77699c7f

[lschiere at pidgin.im]

o   -----------------------------------------------------------------
|   Revision: c421cb45747955754775d5b2884141dc77699c7f
|   Ancestor: 08767f9d9bbfb9f7557b1c973af8e4634c523c17
|   Author: lschiere
|   Date: 2004-12-03T00:43:59
|   Branch: im.pidgin.gaim.oldstatus
|   
|   Modified files:
|           src/protocols/msn/msn.c src/protocols/msn/slpmsg.c
|           src/protocols/msn/switchboard.c
|   
|   ChangeLog: 
|   
|   [gaim-migrate @ 11491]
|   " Well, I found a bug, and even though I had code to
|   prevent that crash it seems it did not. So now here is
|   in a different way, which by the way is more efficient." --Felipe Contreras
|   
|   (19:35:44) shx: LSchiere: there's a bugfix patch for msn in the tracker if
|   it interest you ;)
|   (19:35:59) LSchiere: the one i assigned to nosnilmot just a little bit ago?
|   (19:36:24) shx: LSchiere: probably
|   (19:38:25) LSchiere: i just remembered to day is release day
|   (19:38:51) shx: yeap... so I tought it was important to commit it
|   ============================================================
|   --- src/protocols/msn/msn.c	3203384f13d242f8a7e00a44f51a360ac5bc62d3
|   +++ src/protocols/msn/msn.c	41bcbd01c4a80a0d316f3d72f5a817a5c3fa9ac3
|   @@ -1228,16 +1228,8 @@ msn_convo_closed(GaimConnection *gc, con
|    
|    	cmdproc = swboard->servconn->cmdproc;
|    
|   -#if 0
|   -	if (swboard->current_users == 1)
|   -	{
|   -		msn_cmdproc_send_quick(cmdproc, "OUT", NULL, NULL);
|   -		msn_switchboard_destroy(swboard);
|   -	}
|   -#else
|    	msn_cmdproc_send_quick(cmdproc, "OUT", NULL, NULL);
|    	msn_switchboard_destroy(swboard);
|   -#endif
|    }
|    
|    static void
|   ============================================================
|   --- src/protocols/msn/slpmsg.c	c337ab125861993ca8042cad018468112b6e2e9e
|   +++ src/protocols/msn/slpmsg.c	e774ba0fef7cfdef11a1abd15f843d698758fa87
|   @@ -65,21 +65,29 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg
|    
|    	if (slpmsg->msg != NULL)
|    	{
|   +		/* Something is pointing to this slpmsg, so we should remove that
|   +		 * pointer to prevent a crash. */
|   +		/* Ex: a user goes offline and after that we receive an ACK */
|   +
|   +		gaim_debug_info("msn", "Unlink slpmsg callbacks.\n");
|   +
|   +		slpmsg->msg->ack_cb = NULL;
|   +		slpmsg->msg->ack_data = NULL;
|   +
|   +#if 0
|    		MsnTransaction *trans;
|    
|    		trans = slpmsg->msg->trans;
|    
|    		if (trans != NULL)
|    		{
|   -			/* Something is pointing to this slpmsg, so we should remove that
|   -			 * pointer to prevent a crash. */
|   -
|    			if (trans->callbacks != NULL && trans->has_custom_callbacks)
|    				g_hash_table_destroy(trans->callbacks);
|    			
|    			trans->callbacks = NULL;
|    			trans->data = NULL;
|    		}
|   +#endif
|    	}
|    
|    	slplink->slp_msgs =
|   ============================================================
|   --- src/protocols/msn/switchboard.c	52e7cbccac7644312eab28875a12386364f49308
|   +++ src/protocols/msn/switchboard.c	145f10099c93b55bcfac3847122e2afd6a632ec8
|   @@ -525,7 +525,8 @@ msg_ack (MsnCmdProc *cmdproc, MsnCommand
|    
|    	msg = cmd->trans->data;
|    
|   -	msg->ack_cb(msg->ack_data);
|   +	if (msg->ack_cb != NULL)
|   +		msg->ack_cb(msg->ack_data);
|    
|    	msn_message_unref(msg);
|    }

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from c421cb45747955754775d5b2884141dc77699c7f