diff src/protocols/msn/session.c @ 8808:bbd8cdaf0ad5

[gaim-migrate @ 9570] A massive patch by shx to reorganize MSN some more and add command processor support. This allows us to do cool things like produce more detailed error messages. For example, the Invalid Username dialog now shows the username of the invalid user. I modified the aforementioned dialog so it'll look a little nicer looking, and also mention the account this happened on. It also removes the user from your blist, as there's no point to keeping the user on there. committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/session.c	Sun Apr 25 17:01:38 2004 +0000
+++ b/src/protocols/msn/session.c	Sun Apr 25 22:02:06 2004 +0000
@@ -158,13 +158,16 @@
 msn_session_open_switchboard(MsnSession *session)
 {
 	MsnSwitchBoard *swboard;
+	MsnCmdProc *cmdproc;
 
 	g_return_val_if_fail(session != NULL, NULL);
 
-	if (msn_servconn_send_command(session->notification_conn, "XFR", "SB") < 0)
-	{
+	cmdproc = session->notification_conn->cmdproc;
+
+	msn_cmdproc_send(cmdproc, "XFR", "%s", "SB");
+
+	if (cmdproc->error)
 		return NULL;
-	}
 
 	swboard = msn_switchboard_new(session);
 
@@ -174,13 +177,14 @@
 gboolean
 msn_session_change_status(MsnSession *session, const char *state)
 {
-	MsnUser *user = session->user;
+	MsnCmdProc *cmdproc;
+	MsnUser *user;
 	MsnObject *msnobj;
-	char buf[MSN_BUF_LEN];
 
 	g_return_val_if_fail(session != NULL, FALSE);
 	g_return_val_if_fail(state   != NULL, FALSE);
 
+	user = session->user;
 	msnobj = msn_user_get_object(user);
 
 	if (state != session->away_state)
@@ -191,26 +195,22 @@
 		session->away_state = g_strdup(state);
 	}
 
+	cmdproc = session->notification_conn->cmdproc;
+
 	if (msnobj == NULL)
-		g_snprintf(buf, sizeof(buf), "%s %d", state, MSN_CLIENT_ID);
+	{
+		msn_cmdproc_send(cmdproc, "CHG", "%s %d", state, MSN_CLIENT_ID);
+	}
 	else
 	{
 		char *msnobj_str = msn_object_to_string(msnobj);
 
-		g_snprintf(buf, sizeof(buf), "%s %d %s", state, MSN_CLIENT_ID,
-				   gaim_url_encode(msnobj_str));
+		msn_cmdproc_send(cmdproc, "CHG", "%s %d %s", state, MSN_CLIENT_ID,
+						 gaim_url_encode(msnobj_str));
 
 		g_free(msnobj_str);
 	}
 
-	if (!msn_servconn_send_command(session->notification_conn, "CHG", buf))
-	{
-		gaim_connection_error(gaim_account_get_connection(session->account),
-							  _("Write error"));
-
-		return FALSE;
-	}
-
 	return TRUE;
 }