Changeset a1d30c5 for protocols/msn/msn.c

Timestamp:

2015-05-28T04:12:23Z (9 years ago)

Author:

dequis <dx@…>

Children:

d2d2b80

Parents:

ec8b369 (diff), 3d31618 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

File:

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

protocols/msn/msn.c

@@ -144 +144 @@
 {
         struct bee_user *bu = bee_user_by_handle(ic->bee, ic, who);
-
-#ifdef DEBUG
-        if (strcmp(who, "raw") == 0) {
-                msn_ns_write(ic, -1, "%s\r\n", message);
-                return 0;
-        }
-#endif
-
-        msn_ns_sendmessage(ic, bu, message);
-        return(0);
+        msn_ns_send_message(ic, bu, message);
+        return 0;
 }
 
@@ -277 +269 @@
                 return 0;
         } else if (typing & OPT_TYPING) {
-                return(msn_buddy_msg(ic, who, TYPING_NOTIFICATION_MESSAGE, 0));
+                return msn_ns_send_typing(ic, bu);
         } else {
                 return 1;
@@ -338 +330 @@
 
         g_tree_remove(md->domaintree, bu->handle);
-}
-
-GList *msn_buddy_action_list(bee_user_t *bu)
-{
-        static GList *ret = NULL;
-
-        if (ret == NULL) {
-                static const struct buddy_action ba[2] = {
-                        { "NUDGE", "Draw attention" },
-                };
-
-                ret = g_list_prepend(ret, (void *) ba + 0);
-        }
-
-        return ret;
-}
-
-void *msn_buddy_action(struct bee_user *bu, const char *action, char * const args[], void *data)
-{
-        if (g_strcasecmp(action, "NUDGE") == 0) {
-                msn_buddy_msg(bu->ic, bu->handle, NUDGE_MESSAGE, 0);
-        }
-
-        return NULL;
 }
 
@@ -392 +360 @@
         ret->buddy_data_add = msn_buddy_data_add;
         ret->buddy_data_free = msn_buddy_data_free;
-        ret->buddy_action_list = msn_buddy_action_list;
-        ret->buddy_action = msn_buddy_action;
 
         register_protocol(ret);