# HG changeset patch
# User masca@cpw.pidgin.im
# Date 1276991716 0
# Node ID ead7b8c19725706c2ba2c31175e4f82d9d30ada9
# Parent  2327aa51a78003ac1502235e99012d9042e374c9
Fix integration between Switchboard and SBConn. by setting public some functions on both sides. Regresion introduced in 99802eb80a7acd

diff -r 2327aa51a780 -r ead7b8c19725 libpurple/protocols/msn/sbconn.c
--- a/libpurple/protocols/msn/sbconn.c	Sat Jun 19 23:23:23 2010 +0000
+++ b/libpurple/protocols/msn/sbconn.c	Sat Jun 19 23:55:16 2010 +0000
@@ -1,4 +1,5 @@
 #include "internal.h"
+#include "debug.h"
 
 #include "msg.h"
 #include "sbconn.h"
@@ -109,6 +110,17 @@
 	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)
 {
@@ -182,8 +194,8 @@
 	msn_message_ref(msg);
 }
 
-static void
-process_queue(MsnSwitchBoard *swboard)
+void
+msn_sbconn_process_queue(MsnSwitchBoard *swboard)
 {
 	MsnMessage *msg;
 
diff -r 2327aa51a780 -r ead7b8c19725 libpurple/protocols/msn/sbconn.h
--- a/libpurple/protocols/msn/sbconn.h	Sat Jun 19 23:23:23 2010 +0000
+++ b/libpurple/protocols/msn/sbconn.h	Sat Jun 19 23:55:16 2010 +0000
@@ -16,4 +16,7 @@
 void msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg,
 						 gboolean queue);
 
+void
+msn_sbconn_process_queue(MsnSwitchBoard *swboard);
+
 #endif /* MSN_SBCONN_H */
diff -r 2327aa51a780 -r ead7b8c19725 libpurple/protocols/msn/switchboard.c
--- a/libpurple/protocols/msn/switchboard.c	Sat Jun 19 23:23:23 2010 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Sat Jun 19 23:55:16 2010 +0000
@@ -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 @@
 	return FALSE;
 }
 
-static void
+void
 msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error)
 {
 	MsnSwitchBoard *swboard;
@@ -565,17 +563,6 @@
  * 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 @@
 
 	msn_switchboard_add_user(swboard, passport);
 
-	process_queue(swboard);
+	msn_sbconn_process_queue(swboard);
 
 	if (!session->http_method)
 		send_clientcaps(swboard);
diff -r 2327aa51a780 -r ead7b8c19725 libpurple/protocols/msn/switchboard.h
--- a/libpurple/protocols/msn/switchboard.h	Sat Jun 19 23:23:23 2010 +0000
+++ b/libpurple/protocols/msn/switchboard.h	Sat Jun 19 23:55:16 2010 +0000
@@ -244,6 +244,9 @@
 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);