soc.2010.msn-tlc: fadddca6: Fix integration between Switchboard and ...

[masca at cpw.pidgin.im]

-----------------------------------------------------------------
Revision: fadddca6bb1e4bdb7ae23d12715c3bf6fc7224ee
Ancestor: 101ed1ac46085f1d8d934856a4b9ec067bfc4d1f
Author: masca at cpw.pidgin.im
Date: 2010-06-19T23:55:16
Branch: im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/fadddca6bb1e4bdb7ae23d12715c3bf6fc7224ee

Modified files:
        libpurple/protocols/msn/sbconn.c
        libpurple/protocols/msn/sbconn.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h

ChangeLog: 

Fix integration between Switchboard and SBConn. by setting public some functions on both sides. Regresion introduced in 99802eb80a7acd

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/sbconn.c	d3d03662b6a24be5e3577fc2a371dc8642c1b472
+++ libpurple/protocols/msn/sbconn.c	6b057658aeaf01c5b55fbd49684c72092f91ad90
@@ -1,4 +1,5 @@
 #include "internal.h"
+#include "debug.h"
 
 #include "msg.h"
 #include "sbconn.h"
@@ -109,7 +110,18 @@ void msn_sbconn_send_part(MsnSlpLink *sl
 	msn_switchboard_send_msg(slplink->swboard, msg, TRUE);
 }
 
+/** Called when a message times out. */
 static void
+msg_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans)
+{
+	MsnMessage *msg;
+
+	msg = trans->data;
+
+	msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_TIMEOUT);
+}
+
+static void
 release_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
 {
 	MsnCmdProc *cmdproc;
@@ -182,8 +194,8 @@ queue_msg(MsnSwitchBoard *swboard, MsnMe
 	msn_message_ref(msg);
 }
 
-static void
-process_queue(MsnSwitchBoard *swboard)
+void
+msn_sbconn_process_queue(MsnSwitchBoard *swboard)
 {
 	MsnMessage *msg;
 
============================================================
--- libpurple/protocols/msn/sbconn.h	aef517afd1298a5f8399cdc7033a6e1bf2f47b59
+++ libpurple/protocols/msn/sbconn.h	00058b70cb8c27a869f83c2a8e99aad33ab29d82
@@ -16,4 +16,7 @@ void msn_switchboard_send_msg(MsnSwitchB
 void msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
 						 gboolean queue);
 
+void
+msn_sbconn_process_queue(MsnSwitchBoard *swboard);
+
 #endif /* MSN_SBCONN_H */
============================================================
--- libpurple/protocols/msn/switchboard.c	f8d24ebdb05de1f8c625d58008ba42066789b68f
+++ libpurple/protocols/msn/switchboard.c	58fbec89a45874ea10b18654fed4500467e06616
@@ -27,15 +27,13 @@
 
 #include "msnutils.h"
 #include "switchboard.h"
+#include "sbconn.h"
 #include "slplink.h"
 #include "user.h"
 #include "userlist.h"
 
 static MsnTable *cbs_table;
 
-static void msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg,
-							 MsnMsgErrorType error);
-
 /**************************************************************************
  * Main
  **************************************************************************/
@@ -428,7 +426,7 @@ msg_resend_cb(gpointer data)
 	return FALSE;
 }
 
-static void
+void
 msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
 {
 	MsnSwitchBoard *swboard;
@@ -565,17 +563,6 @@ msg_error_helper(MsnCmdProc *cmdproc, Ms
  * Message Stuff
  **************************************************************************/
 
-/** Called when a message times out. */
-static void
-msg_timeout(MsnCmdProc *cmdproc, MsnTransaction *trans)
-{
-	MsnMessage *msg;
-
-	msg = trans->data;
-
-	msg_error_helper(cmdproc, msg, MSN_MSG_ERROR_TIMEOUT);
-}
-
 /** Called when we receive an error of a message. */
 static void
 msg_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
@@ -705,7 +692,7 @@ joi_cmd(MsnCmdProc *cmdproc, MsnCommand 
 
 	msn_switchboard_add_user(swboard, passport);
 
-	process_queue(swboard);
+	msn_sbconn_process_queue(swboard);
 
 	if (!session->http_method)
 		send_clientcaps(swboard);
============================================================
--- libpurple/protocols/msn/switchboard.h	213668bd46400c651643874115b0b2fd551ce388
+++ libpurple/protocols/msn/switchboard.h	56cc2f378d15a8414f63d988e5345c89330ee9f2
@@ -244,6 +244,9 @@ void msn_switchboard_send_msg(MsnSwitchB
 void msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
 							  gboolean queue);
 
+void
+msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error);
+
 gboolean msn_switchboard_chat_leave(MsnSwitchBoard *swboard);
 gboolean msn_switchboard_chat_invite(MsnSwitchBoard *swboard, const char *who);