diff src/protocols/msn/msg.h @ 10345:2e01c503aa4f

[gaim-migrate @ 11556] Patch 1078151 from Felipe Contreras to fix some more MSN bugs: "User Dislpay messages, and other less used, did not set an slpcall, so the callback that should not be called, was called (in some very special cases)." ... "Here it goes the real real one, as far as I can tell. Cleaning + organizing + documentation + hard bug fix = big patch." -- Felipe Contreras I also fixed drag-and-drop to conversation window file transfers (which I had broken when I fixed some other dnd thing), made the debug output of the autoreconnect plugin more useful, and stopped the message notification plugin notifying you for messages sent by ignored users. committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/msg.h	Sat Dec 11 00:06:06 2004 +0000
+++ b/src/protocols/msn/msg.h	Sat Dec 11 20:01:58 2004 +0000
@@ -32,7 +32,7 @@
 #include "command.h"
 #include "transaction.h"
 
-typedef void (*MsnCb)(void *data);
+typedef void (*MsnMsgCb)(MsnMessage *, void *data);
 
 /*
 typedef enum
@@ -54,6 +54,16 @@
 
 } MsnMsgType;
 
+typedef enum
+{
+	MSN_MSG_ERROR_NONE, /**< No error. */
+	MSN_MSG_ERROR_TIMEOUT, /**< The message timedout. */
+	MSN_MSG_ERROR_NAK, /**< The message could not be sent. */
+	MSN_MSG_ERROR_SB, /**< The error comes from the switchboard. */
+	MSN_MSG_ERROR_UNKNOWN /**< An unknown error occured. */
+
+} MsnMsgErrorType;
+
 typedef struct
 {
 	guint32 session_id;
@@ -102,8 +112,13 @@
 	MsnCommand *cmd;
 	MsnTransaction *trans;
 
-	MsnCb ack_cb;
-	void *ack_data;
+	MsnMsgCb ack_cb; /**< The callback to call when we receive an ACK of this
+					message. */
+	MsnMsgCb nak_cb; /**< The callback to call when we receive a NAK of this
+					message. */
+	void *ack_data; /**< The data used by callbacks. */
+
+	MsnMsgErrorType error; /**< The error of the message. */
 };
 
 /**