soc.2010.msn-tlc: 50866b18: Hide msn_slplink_destroy and use the unr...

[masca at cpw.pidgin.im]

-----------------------------------------------------------------
Revision: 50866b18d43f2d75de77e9541e28af56c97d7e4b
Ancestor: 2e8c4d52447b1f02589bc2b229910c3c3fa1f6c4
Author: masca at cpw.pidgin.im
Date: 2010-06-24T00:12:45
Branch: im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/50866b18d43f2d75de77e9541e28af56c97d7e4b

Modified files:
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/switchboard.c

ChangeLog: 

Hide msn_slplink_destroy and use the unref version everywhere.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/directconn.c	7afe7a119ed7eb861dc241d0eed931bb9b47702a
+++ libpurple/protocols/msn/directconn.c	02ce8a59fae9e3d5fbf701d2fc0f1b146f941d20
@@ -185,7 +185,7 @@ msn_dc_destroy(MsnDirectConn *dc)
 	if (slplink) {
 		slplink->dc = NULL;
 		if (slplink->swboard == NULL)
-			msn_slplink_destroy(slplink);
+			msn_slplink_unref(slplink);
 	}
 
 	g_free(dc->msg_body);
============================================================
--- libpurple/protocols/msn/session.c	59bc452ab08df2c364faea2941d97ee80055d82d
+++ libpurple/protocols/msn/session.c	bf1425dba506b08d3c1807b4362a8ee90b62e2ec
@@ -72,7 +72,7 @@ msn_session_destroy(MsnSession *session)
 		g_hash_table_destroy(session->soap_table);
 
 	while (session->slplinks != NULL)
-		msn_slplink_destroy(session->slplinks->data);
+		msn_slplink_unref(session->slplinks->data);
 
 	while (session->switches != NULL)
 		msn_switchboard_destroy(session->switches->data);
============================================================
--- libpurple/protocols/msn/slplink.c	c43a16178951d554a99aeba09eaac496e093c75b
+++ libpurple/protocols/msn/slplink.c	f6d607ab52c91a2420f37b40120f2ee860a471d3
@@ -88,7 +88,7 @@ msn_slplink_new(MsnSession *session, con
 	return msn_slplink_ref(slplink);
 }
 
-void
+static void
 msn_slplink_destroy(MsnSlpLink *slplink)
 {
 	MsnSession *session;
============================================================
--- libpurple/protocols/msn/slplink.h	d25b835455385fc867cc09fadb3128b70b0da23d
+++ libpurple/protocols/msn/slplink.h	2a1c1b8d016b867bec868b5df839d4a2d3011a17
@@ -57,8 +57,6 @@ void msn_slplink_unref(MsnSlpLink *slpli
 MsnSlpLink *msn_slplink_ref(MsnSlpLink *slplink);
 void msn_slplink_unref(MsnSlpLink *slplink);
 
-void msn_slplink_destroy(MsnSlpLink *slplink);
-
 /**
  * @return An MsnSlpLink for the given user, or NULL if there is no
  *         existing MsnSlpLink.
============================================================
--- libpurple/protocols/msn/switchboard.c	58fbec89a45874ea10b18654fed4500467e06616
+++ libpurple/protocols/msn/switchboard.c	b4fb470ee3d16066a22090e51aa28fec0d2a2b16
@@ -90,9 +90,11 @@ msn_switchboard_destroy(MsnSwitchBoard *
 	while (swboard->slplinks != NULL) {
 		MsnSlpLink *slplink = swboard->slplinks->data;
 
+		swboard->slplinks = g_list_remove(swboard->slplinks, slplink);
+
 		/* Destroy only those slplinks which use the switchboard */
 		if (slplink->dc == NULL)
-			msn_slplink_destroy(slplink);
+			msn_slplink_unref(slplink);
 		else {
 			swboard->slplinks = g_list_remove(swboard->slplinks, slplink);
 			slplink->swboard = NULL;