Changeset 68b518d6 for protocols/oscar/oscar.c

Timestamp:

2006-05-26T09:03:38Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cdca30b

Parents:

41ca004 (diff), c53911e (diff), 7bfd574 (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 from main development tree.

File:

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

protocols/oscar/oscar.c

@@ -2 +2 @@
  * gaim
  *
+ * Some code copyright (C) 2002-2006, Jelmer Vernooij <jelmer@samba.org>
+ *                                    and the BitlBee team.
  * Some code copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
  * libfaim code copyright 1998, 1999 Adam Fritzler <afritz@auk.cx>
@@ -136 +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);
 
@@ -390 +392 @@
         if (g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.icq.com") != 0 &&
             g_strcasecmp(user->proto_opt[USEROPT_AUTH], "login.oscar.aol.com") != 0) {
-                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.");
+                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",user->proto_opt[USEROPT_AUTH]);
         }
         
@@ -2517 +2519 @@
         int ret;
         guint8 len = strlen(message);
+        guint16 flags;
         char *s;
         
@@ -2525 +2528 @@
                 if (*s & 128)
                         break;
-                
+        
+        flags = AIM_CHATFLAGS_NOREFLECT;
+        
         /* Message contains high ASCII chars, time for some translation! */
         if (*s) {
@@ -2532 +2537 @@
                    If we can't, fall back to UTF16. */
                 if ((ret = do_iconv("UTF-8", "ISO8859-1", message, s, len, BUF_LONG)) >= 0) {
+                        flags |= AIM_CHATFLAGS_ISO_8859_1;
                         len = ret;
                 } else if ((ret = do_iconv("UTF-8", "UNICODEBIG", message, s, len, BUF_LONG)) >= 0) {
+                        flags |= AIM_CHATFLAGS_UNICODE;
                         len = ret;
                 } else {
@@ -2544 +2551 @@
         }
                 
-        ret = aim_chat_send_im(od->sess, ccon->conn, AIM_CHATFLAGS_NOREFLECT, s, len);
+        ret = aim_chat_send_im(od->sess, ccon->conn, flags, s, len);
                 
         if (s != message) {     
@@ -2617 +2624 @@
         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);