Changeset 704dd38 for protocols/oscar

Timestamp:

2010-06-01T21:51:27Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ad404ab

Parents:

3429b58 (diff), ba3233c (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:

Merging head.

File:

• protocols/oscar/oscar.c (modified) (2 diffs)

protocols/oscar/oscar.c

@@ -1034 +1034 @@
                 m = g_list_append(m, exch);
 
-                g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", name, userinfo->sn, args->msg );
+                g_snprintf(txt, 1024, "Got an invitation to chatroom %s from %s: %s", name, userinfo->sn, args->msg);
 
                 inv->ic = ic;
@@ -1040 +1040 @@
                 inv->name = g_strdup(name);
                 
-                imcb_ask( ic, txt, inv, oscar_accept_chat, oscar_reject_chat);
+                imcb_ask(ic, txt, inv, oscar_accept_chat, oscar_reject_chat);
         
                 if (name)
                         g_free(name);
+        } else if (args->reqclass & AIM_CAPS_ICQRTF) {
+                // TODO: constify
+                char text[strlen(args->info.rtfmsg.rtfmsg)+1];
+                strncpy(text, args->info.rtfmsg.rtfmsg, sizeof(text));
+                imcb_buddy_msg(ic, normalize(userinfo->sn), text, 0, 0);
         }