pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16538] branches/v2_0_0/src/protocols/msn/servconn.c

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

Revision: 16538
Author:   thekingant
Date:     2006-07-22 11:14:40 -0700 (Sat, 22 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16538&view=rev

Log Message:
-----------
Backport SVN revision #16537 from HEAD to v2_0_0
Original commit message:

Hopefully prevent an assertion failure when you lose your connection
to MSN.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16537&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/msn/servconn.c
Modified: branches/v2_0_0/src/protocols/msn/servconn.c
===================================================================
--- branches/v2_0_0/src/protocols/msn/servconn.c	2006-07-22 18:11:34 UTC (rev 16537)
+++ branches/v2_0_0/src/protocols/msn/servconn.c	2006-07-22 18:14:40 UTC (rev 16538)
@@ -125,6 +125,8 @@
 	const char *names[] = { "Notification", "Switchboard" };
 	const char *name;
 
+	msn_servconn_disconnect(servconn);
+
 	name = names[servconn->type];
 
 	switch (error)
@@ -156,8 +158,6 @@
 			swboard->error = MSN_SB_ERROR_CONNECTION;
 	}
 
-	msn_servconn_disconnect(servconn);
-
 	g_free(tmp);
 }
 


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

[Gaim-commits] SF.net SVN: gaim: [16620] branches/v2_0_0/src/protocols/msn/servconn.c

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

Revision: 16620
Author:   thekingant
Date:     2006-08-02 09:47:58 -0700 (Wed, 02 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16620&view=rev

Log Message:
-----------
Revert SVN revision #16537, which should fix bug #1527828

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16537&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/msn/servconn.c
Modified: branches/v2_0_0/src/protocols/msn/servconn.c
===================================================================
--- branches/v2_0_0/src/protocols/msn/servconn.c	2006-08-02 16:47:55 UTC (rev 16619)
+++ branches/v2_0_0/src/protocols/msn/servconn.c	2006-08-02 16:47:58 UTC (rev 16620)
@@ -125,8 +125,6 @@
 	const char *names[] = { "Notification", "Switchboard" };
 	const char *name;
 
-	msn_servconn_disconnect(servconn);
-
 	name = names[servconn->type];
 
 	switch (error)
@@ -158,6 +156,8 @@
 			swboard->error = MSN_SB_ERROR_CONNECTION;
 	}
 
+	msn_servconn_disconnect(servconn);
+
 	g_free(tmp);
 }
 


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