Changeset 8661caa for protocols/oscar/oscar.c

Timestamp:

2008-08-04T14:45:24Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

87f525e

Parents:

4ac647d (diff), 718e05f (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:

merged in upstream r410.

Only conflict was the correction of jabber normalization which I had already done.

File:

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

protocols/oscar/oscar.c

@@ -60 +60 @@
 
 #define OSCAR_GROUP "Friends"
+
+#define BUF_LEN 2048
+#define BUF_LONG ( BUF_LEN * 2 )
 
 /* Don't know if support for UTF8 is really working. For now it's UTF16 here.
@@ -240 +243 @@
 };
 static int msgerrreasonlen = 25;
+
+/* Hurray, this function is NOT thread-safe \o/ */
+static char *normalize(const char *s)
+{
+        static char buf[BUF_LEN];
+        char *t, *u;
+        int x = 0;
+
+        g_return_val_if_fail((s != NULL), NULL);
+
+        u = t = g_strdup(s);
+
+        strcpy(t, s);
+        g_strdown(t);
+
+        while (*t && (x < BUF_LEN - 1)) {
+                if (*t != ' ' && *t != '!') {
+                        buf[x] = *t;
+                        x++;
+                }
+                t++;
+        }
+        buf[x] = '\0';
+        g_free(u);
+        return buf;
+}
 
 static gboolean oscar_callback(gpointer data, gint source,
@@ -1002 +1031 @@
         }
 
-        tmp = g_strdup(normalize(ic->acc->user));
-        if (!strcmp(tmp, normalize(info->sn)))
+        if (!aim_sncmp(ic->acc->user, info->sn))
                 g_snprintf(ic->displayname, sizeof(ic->displayname), "%s", info->sn);
-        g_free(tmp);
-
-        imcb_buddy_status(ic, info->sn, flags, state_string, NULL);
-        /* imcb_buddy_times(ic, info->sn, signon, time_idle); */
+
+        tmp = normalize(info->sn);
+        imcb_buddy_status(ic, tmp, flags, state_string, NULL);
+        /* imcb_buddy_times(ic, tmp, signon, time_idle); */
+
 
         return 1;
@@ -1022 +1051 @@
         va_end(ap);
 
-        imcb_buddy_status(ic, info->sn, 0, NULL, NULL );
+        imcb_buddy_status(ic, normalize(info->sn), 0, NULL, NULL );
 
         return 1;
@@ -1078 +1107 @@
         
         strip_linefeed(tmp);
-        imcb_buddy_msg(ic, userinfo->sn, tmp, flags, 0);
+        imcb_buddy_msg(ic, normalize(userinfo->sn), tmp, flags, 0);
         g_free(tmp);
         
@@ -1177 +1206 @@
                         message = g_strdup(args->msg);
                         strip_linefeed(message);
-                        imcb_buddy_msg(ic, uin, message, 0, 0);
+                        imcb_buddy_msg(ic, normalize(uin), message, 0, 0);
                         g_free(uin);
                         g_free(message);
@@ -1196 +1225 @@
 
                         strip_linefeed(message);
-                        imcb_buddy_msg(ic, uin, message, 0, 0);
+                        imcb_buddy_msg(ic, normalize(uin), message, 0, 0);
                         g_free(uin);
                         g_free(m);
@@ -1471 +1500 @@
 
         for (i = 0; i < count; i++)
-                imcb_chat_add_buddy(c->cnv, info[i].sn);
+                imcb_chat_add_buddy(c->cnv, normalize(info[i].sn));
 
         return 1;
@@ -1494 +1523 @@
 
         for (i = 0; i < count; i++)
-                imcb_chat_remove_buddy(c->cnv, info[i].sn, NULL);
+                imcb_chat_remove_buddy(c->cnv, normalize(info[i].sn), NULL);
 
         return 1;
@@ -1545 +1574 @@
         tmp = g_malloc(BUF_LONG);
         g_snprintf(tmp, BUF_LONG, "%s", msg);
-        imcb_chat_msg(ccon->cnv, info->sn, tmp, 0, 0);
+        imcb_chat_msg(ccon->cnv, normalize(info->sn), tmp, 0, 0);
         g_free(tmp);
 
@@ -1758 +1787 @@
                         g_snprintf(sender, sizeof(sender), "%u", msg->sender);
                         strip_linefeed(dialog_msg);
-                        imcb_buddy_msg(ic, sender, dialog_msg, 0, t);
+                        imcb_buddy_msg(ic, normalize(sender), dialog_msg, 0, t);
                         g_free(dialog_msg);
                 } break;
@@ -1779 +1808 @@
 
                         strip_linefeed(dialog_msg);
-                        imcb_buddy_msg(ic, sender, dialog_msg, 0, t);
+                        imcb_buddy_msg(ic, normalize(sender), dialog_msg, 0, t);
                         g_free(dialog_msg);
                         g_free(m);
@@ -2017 +2046 @@
         struct aim_ssi_item *curitem;
         int tmp;
+        char *nrm;
 
         /* Add from server list to local list */
         tmp = 0;
         for (curitem=sess->ssi.items; curitem; curitem=curitem->next) {
+                nrm = curitem->name ? normalize(curitem->name) : NULL;
+                
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!imcb_find_buddy(ic, curitem->name))) {
+                                if ((curitem->name) && (!imcb_find_buddy(ic, nrm))) {
                                         char *realname = NULL;
 
@@ -2029 +2061 @@
                                                     realname = aim_gettlv_str(curitem->data, 0x0131, 1);
                                                 
-                                        imcb_add_buddy(ic, curitem->name, NULL);
+                                        imcb_add_buddy(ic, nrm, NULL);
                                         
                                         if (realname) {
-                                                imcb_buddy_nick_hint(ic, curitem->name, realname);
-                                                imcb_rename_buddy(ic, curitem->name, realname);
+                                                imcb_buddy_nick_hint(ic, nrm, realname);
+                                                imcb_rename_buddy(ic, nrm, realname);
                                                 g_free(realname);
                                         }
@@ -2045 +2077 @@
                                         if (!list) {
                                                 char *name;
-                                                name = g_strdup(normalize(curitem->name));
+                                                name = g_strdup(nrm);
                                                 ic->permit = g_slist_append(ic->permit, name);
                                                 tmp++;
@@ -2058 +2090 @@
                                         if (!list) {
                                                 char *name;
-                                                name = g_strdup(normalize(curitem->name));
+                                                name = g_strdup(nrm);
                                                 ic->deny = g_slist_append(ic->deny, name);
                                                 tmp++;
@@ -2120 +2152 @@
                         if( st == 0x00 )
                         {
-                                imcb_add_buddy( sess->aux_data, list, NULL );
+                                imcb_add_buddy( sess->aux_data, normalize(list), NULL );
                         }
                         else if( st == 0x0E )
@@ -2450 +2482 @@
         if(type2 == 0x0002) {
                 /* User is typing */
-                imcb_buddy_typing(ic, sn, OPT_TYPING);
+                imcb_buddy_typing(ic, normalize(sn), OPT_TYPING);
         } 
         else if (type2 == 0x0001) {
                 /* User has typed something, but is not actively typing (stale) */
-                imcb_buddy_typing(ic, sn, OPT_THINKING);
+                imcb_buddy_typing(ic, normalize(sn), OPT_THINKING);
         }
         else {
                 /* User has stopped typing */
-                imcb_buddy_typing(ic, sn, 0);
+                imcb_buddy_typing(ic, normalize(sn), 0);
         }