diff src/protocols/msn/session.c @ 9158:c30d81b4dd22

[gaim-migrate @ 9942] Patch from Felipe Contreras to sync our MSN prpl with what's in his tree. He says this may fix a couple bugs, but the important thing is the restructuring of how MsnMessages work. Lots of style changes and other stuff as well. committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/session.c	Tue Jun 01 01:55:55 2004 +0000
+++ b/src/protocols/msn/session.c	Tue Jun 01 06:42:20 2004 +0000
@@ -24,7 +24,7 @@
 #include "notification.h"
 
 MsnSession *
-msn_session_new(GaimAccount *account, const char *server, int port)
+msn_session_new(GaimAccount *account, const char *host, int port)
 {
 	MsnSession *session;
 
@@ -32,9 +32,9 @@
 
 	session = g_new0(MsnSession, 1);
 
-	session->account         = account;
-	session->dispatch_server = g_strdup(server);
-	session->dispatch_port   = port;
+	session->account       = account;
+	session->dispatch_host = g_strdup(host);
+	session->dispatch_port = port;
 
 	session->away_state = NULL;
 
@@ -58,8 +58,8 @@
 	if (session->connected)
 		msn_session_disconnect(session);
 
-	if (session->dispatch_server != NULL)
-		g_free(session->dispatch_server);
+	if (session->dispatch_host != NULL)
+		g_free(session->dispatch_host);
 
 	while (session->switches != NULL)
 		msn_switchboard_destroy(session->switches->data);
@@ -114,8 +114,8 @@
 	session->notification_conn = msn_notification_new(session);
 
 	if (msn_notification_connect(session->notification_conn,
-									 session->dispatch_server,
-									 session->dispatch_port))
+								 session->dispatch_host,
+								 session->dispatch_port))
 	{
 		return TRUE;
 	}
@@ -129,13 +129,15 @@
 	g_return_if_fail(session != NULL);
 	g_return_if_fail(session->connected);
 
-	while (session->switches != NULL) {
+	while (session->switches != NULL)
+	{
 		MsnSwitchBoard *board = (MsnSwitchBoard *)session->switches->data;
 
 		msn_switchboard_destroy(board);
 	}
 
-	if (session->notification_conn != NULL) {
+	if (session->notification_conn != NULL)
+	{
 		msn_servconn_destroy(session->notification_conn);
 		session->notification_conn = NULL;
 	}
@@ -208,7 +210,7 @@
 	GList *l;
 	MsnSwitchBoard *swboard;
 
-	g_return_val_if_fail(session != NULL, NULL);
+	g_return_val_if_fail(session  != NULL, NULL);
 	g_return_val_if_fail(passport != NULL, NULL);
 
 	for (l = session->switches; l != NULL; l = l->next)
@@ -235,7 +237,8 @@
 	g_return_val_if_fail(session != NULL, NULL);
 	g_return_val_if_fail(chat_id > 0, NULL);
 
-	for (l = session->switches; l != NULL; l = l->next) {
+	for (l = session->switches; l != NULL; l = l->next)
+	{
 		swboard = (MsnSwitchBoard *)l->data;
 
 		if (swboard->chat_id == chat_id)
@@ -253,7 +256,8 @@
 
 	g_return_val_if_fail(session != NULL, NULL);
 
-	for (l = session->switches; l != NULL; l = l->next) {
+	for (l = session->switches; l != NULL; l = l->next)
+	{
 		swboard = (MsnSwitchBoard *)l->data;
 
 		if (!swboard->in_use)