Changeset 3759849 for protocols/oscar

Timestamp:

2010-06-03T22:08:23Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

eb6df6a

Parents:

1dd3470 (diff), 3dc6d86 (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 in bitlbee head

Location:

protocols/oscar

Files:

• auth.c (modified) (1 diff)
• oscar.c (modified) (3 diffs)

protocols/oscar/auth.c

@@ -120 +120 @@
         aim_snacid_t snacid;
         aim_tlvlist_t *tl = NULL;
+        struct im_connection *ic = sess->aux_data;
         
         if (!sess || !conn || !sn)
                 return -EINVAL;
 
-        if ((sn[0] >= '0') && (sn[0] <= '9'))
+        if (isdigit(sn[0]) && set_getbool(&ic->acc->set, "old_icq_auth"))
                 return goddamnicq(sess, conn, sn);
 

protocols/oscar/oscar.c

@@ -374 +374 @@
         if (isdigit(acc->user[0])) {
                 set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc);
+                set_add(&acc->set, "old_icq_auth", "false", set_eval_bool, acc);
         }
         
@@ -1030 +1031 @@
                 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;
@@ -1036 +1037 @@
                 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);
         }