Changes in protocols/msn/ns.c [0864a52:2fe8297]

File:

• protocols/msn/ns.c (modified) (10 diffs)

protocols/msn/ns.c

@@ -181 +181 @@
                 imcb_error(ic, "Error while reading from server");
                 imc_logout(ic, TRUE);
-                g_free(bytes);
                 return FALSE;
         }
@@ -189 +188 @@
         g_free(bytes);
 
-        return msn_handler(md);
+        /* Ignore ret == 0, it's already disconnected then. */
+        msn_handler(md);
+
+        return TRUE;
+        
 }
 
@@ -394 +397 @@
 
                                         if (inbox && folders) {
-                                                imcb_notify_email(ic,
-                                                        "INBOX contains %s new messages, plus %s messages in other folders.", inbox,
-                                                        folders);
+                                                imcb_log(ic,
+                                                         "INBOX contains %s new messages, plus %s messages in other folders.", inbox,
+                                                         folders);
                                         }
 
@@ -408 +411 @@
 
                                         if (from && fromname) {
-                                                imcb_notify_email(ic, "Received an e-mail message from %s <%s>.", fromname, from);
+                                                imcb_log(ic, "Received an e-mail message from %s <%s>.", fromname,
+                                                         from);
                                         }
 
@@ -416 +420 @@
                         } else if (g_strncasecmp(ct, "text/x-msmsgsactivemailnotification", 35) == 0) {
                                 /* Notification that a message has been read... Ignore it */
+                        } else {
+                                debug("Can't handle %s packet from notification server", ct);
                         }
 
@@ -620 +626 @@
         char l[4];
 
-        if ((bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL)) == 0 || (bd->flags & MSN_BUDDY_ADL_SYNCED)) {
+        if ((bd->flags & 7) == 0 || (bd->flags & MSN_BUDDY_ADL_SYNCED)) {
                 return FALSE;
         }
@@ -638 +644 @@
         }
 
-        g_snprintf(l, sizeof(l), "%d", bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL));
+        g_snprintf(l, sizeof(l), "%d", bd->flags & 7);
         c = xt_new_node("c", NULL, NULL);
         xt_add_attr(c, "n", handle);
@@ -691 +697 @@
                 struct msn_buddy_data *bd = bu->data;
 
-                if (bu->ic != ic || (bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL)) == 0) {
+                if (bu->ic != ic || (bd->flags & 7) == 0) {
                         continue;
                 }
@@ -721 +727 @@
 }
 
-static int msn_ns_send_sdg(struct im_connection *ic, bee_user_t *bu, const char *message_type, const char *text)
+// TODO: typing notifications, nudges lol, etc
+int msn_ns_sendmessage(struct im_connection *ic, bee_user_t *bu, const char *text)
 {
         struct msn_data *md = ic->proto_data;
@@ -727 +734 @@
         char *buf;
 
-        buf = g_strdup_printf(MSN_MESSAGE_HEADERS, bu->handle, ic->acc->user, md->uuid, message_type, strlen(text), text);
+        if (strncmp(text, "\r\r\r", 3) == 0) {
+                /* Err. Shouldn't happen but I guess it can. Don't send others
+                   any of the "SHAKE THAT THING" messages. :-D */
+                return 1;
+        }
+
+        buf = g_strdup_printf(MSN_MESSAGE_HEADERS, bu->handle, ic->acc->user, md->uuid, strlen(text), text);
         retval = msn_ns_write(ic, -1, "SDG %d %zd\r\n%s", ++md->trId, strlen(buf), buf);
         g_free(buf);
         return retval;
 }
-
-int msn_ns_send_typing(struct im_connection *ic, bee_user_t *bu)
-{
-        return msn_ns_send_sdg(ic, bu, "Control/Typing", "");
-}
-
-int msn_ns_send_message(struct im_connection *ic, bee_user_t *bu, const char *text)
-{
-        return msn_ns_send_sdg(ic, bu, "Text", text);
-}
-