Changes in protocols/msn/msn.h [951aefd:99fe030]

File:

• protocols/msn/msn.h (modified) (4 diffs)

protocols/msn/msn.h

@@ -26 +26 @@
 #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 NUDGE_MESSAGE "\r\r\rSHAKE THAT THING\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
@@ -77 +65 @@
 #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" \
@@ -103 +91 @@
         "</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 MSN_NUDGE_HEADERS "MIME-Version: 1.0\r\n" \
-        "Content-Type: text/x-msnmsgr-datacast\r\n" \
-        "\r\n" \
-        "ID: 1\r\n" \
-        "\r\n"
-
 #define PROFILE_URL "http://members.msn.com/"
 
@@ -242 +219 @@
 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);