Changeset 6fb6410 for protocols/oscar

Timestamp:

2006-05-26T15:02:41Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

84eddee

Parents:

1cda4f3 (diff), 6048744 (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] Wilmer

Location:

protocols/oscar

Files:

• chat.c (modified) (2 diffs)
• im.c (modified) (1 diff)
• oscar.c (modified) (2 diffs)

protocols/oscar/chat.c

@@ -163 +163 @@
                  the right charset flags, as we also do with normal
                  messages. Hope this will work. :-) */
+        /*
         if (flags & AIM_CHATFLAGS_UNICODE)
                 aimbs_put16(&fr->data, 0x0002);
@@ -171 +172 @@
         
         aimbs_put16(&fr->data, 0x0000);
+        */
         
         /*

protocols/oscar/im.c

@@ -1469 +1469 @@
             case 0x9c:  /* ICQ 5 seems to send this */
                 aim_send_im_ch2_statusmessage(sess, userinfo->sn, args->cookie,
-                        gc->away, sess->aim_icq_state, dc);
+                        gc->away ? gc->away : "", sess->aim_icq_state, dc);
                 break;
 

protocols/oscar/oscar.c

@@ -138 +138 @@
         int i, j;
         char *x = strchr(name, '-');
-        if (!x) return NULL;
+        if (!x) return g_strdup(name);
         x = strchr(++x, '-');
-        if (!x) return NULL;
+        if (!x) return g_strdup(name);
         tmp = g_strdup(++x);
 
@@ -2607 +2607 @@
         int ret;
         static int chat_id = 0;
-        char * chatname = g_new0(char, strlen(gc->username)+4);
-        
-        g_snprintf(chatname, strlen(gc->username) + 4, "%s%d", gc->username, chat_id++);
+        char * chatname;
+        
+        chatname = g_strdup_printf("%s%d", gc->username, chat_id++);
   
         ret = oscar_chat_join(gc, chatname);