Changeset 936ded6 for protocols

Timestamp:

2006-05-25T08:57:31Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0602496

Parents:

fc630f9

Message:

Disabling chat charset stuff again for now and fixed the crash-bug.
Unfortunately I can't figure out how to generate chat names that don't
break old BitlBees.

Location:

protocols/oscar

Files:

• chat.c (modified) (2 diffs)
• 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/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);