diff options
Diffstat (limited to 'protocols/msn/msn.h')
| -rw-r--r-- | protocols/msn/msn.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/protocols/msn/msn.h b/protocols/msn/msn.h index b76fbd40..02ba7a0d 100644 --- a/protocols/msn/msn.h +++ b/protocols/msn/msn.h @@ -26,17 +26,6 @@ #ifndef _MSN_H #define _MSN_H -/* Some hackish magicstrings to make special-purpose messages/switchboards. - */ -#define TYPING_NOTIFICATION_MESSAGE "\r\r\rBEWARE, ME R TYPINK MESSAGE!!!!\r\r\r" -#define GROUPCHAT_SWITCHBOARD_MESSAGE "\r\r\rME WANT TALK TO MANY PEOPLE\r\r\r" - -#ifdef DEBUG_MSN -#define debug(text ...) imcb_log(ic, text); -#else -#define debug(text ...) -#endif - /* This should be MSN Messenger 7.0.0813 #define MSNP11_PROD_KEY "CFHUR$52U_{VIX5T" #define MSNP11_PROD_ID "PROD0101{0RM?UBW" @@ -75,7 +64,7 @@ #define MSN_MESSAGE_HEADERS MSN_BASE_HEADERS \ "Messaging: 2.0\r\n" \ - "Message-Type: Text\r\n" \ + "Message-Type: %s\r\n" \ "Content-Length: %zd\r\n" \ "Content-Type: text/plain; charset=UTF-8\r\n" \ "X-MMS-IM-Format: FN=Segoe%%20UI; EF=; CO=0; CS=0; PF=0\r\n" \ @@ -101,11 +90,6 @@ "<sep n=\"IM\"><Capabilities>%d:%d</Capabilities></sep>" \ "</user>" -#define MSN_TYPING_HEADERS "MIME-Version: 1.0\r\n" \ - "Content-Type: text/x-msmsgscontrol\r\n" \ - "TypingUser: %s\r\n" \ - "\r\n\r\n" - #define PROFILE_URL "http://members.msn.com/" typedef enum { @@ -234,7 +218,8 @@ void msn_ns_close(struct msn_data *handler); void msn_auth_got_passport_token(struct im_connection *ic, const char *token, const char *error); void msn_auth_got_contact_list(struct im_connection *ic); int msn_ns_finish_login(struct im_connection *ic); -int msn_ns_sendmessage(struct im_connection *ic, struct bee_user *bu, const char *text); +int msn_ns_send_typing(struct im_connection *ic, struct bee_user *bu); +int msn_ns_send_message(struct im_connection *ic, struct bee_user *bu, const char *text); int msn_ns_command(struct msn_data *md, char **cmd, int num_parts); int msn_ns_message(struct msn_data *md, char *msg, int msglen, char **cmd, int num_parts); |