[Gaim-commits] SF.net SVN: gaim: [16963] trunk/libgaim/protocols/msn/switchboard.c

[<the...@us...>]

Revision: 16963
Author:   thekingant
Date:     2006-08-21 15:50:58 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16963&view=rev

Log Message:
-----------
Fix a crazy bug that we found at meebo.  I'm not sure it
affects gtk Gaim in quite the same way, but what was
happeing is that the conversation sequence number should
be incremented by 1 each time a new conversation is
created (whether created by someone else or created by
you).  However, in one place in Gaim conv_seq was being
incremented BEFORE it was used and in another it was
being incremented AFTER it was used.  This can lead to
a sequence number being used twice.

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/switchboard.c
Modified: trunk/libgaim/protocols/msn/switchboard.c
===================================================================
--- trunk/libgaim/protocols/msn/switchboard.c	2006-08-21 22:48:19 UTC (rev 16962)
+++ trunk/libgaim/protocols/msn/switchboard.c	2006-08-21 22:50:58 UTC (rev 16963)
@@ -252,8 +252,7 @@
 				gaim_conversation_destroy(swboard->conv);
 #endif
 
-			cmdproc->session->conv_seq++;
-			swboard->chat_id = cmdproc->session->conv_seq;
+			swboard->chat_id = cmdproc->session->conv_seq++;
 			swboard->flag |= MSN_SB_FLAG_IM;
 			swboard->conv = serv_got_joined_chat(account->gc,
 												 swboard->chat_id,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.