Changeset 601e813 for protocols/oscar/oscar.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (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

File:

• protocols/oscar/oscar.c (modified) (14 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>
@@ -356 +358 @@
         if (isdigit(*user->username)) {
                 odata->icq = TRUE;
-                /* this is odd but it's necessary for a proper do_import and do_export */
+                /* This is odd but it's necessary for a proper do_import and do_export.
+                   We don't do those anymore, but let's stick with it, just in case
+                   it accidentally fixes something else too... */
                 gc->password[8] = 0;
         } else {
@@ -381 +385 @@
         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]);
         }
         
@@ -1117 +1121 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        show_got_added(data->gc, NULL, uin, NULL, NULL);
+        if(find_buddy(data->gc, uin) == NULL)
+                show_got_added(data->gc, uin, NULL);
         
         g_free(uin);
@@ -1148 +1153 @@
                 reason = msg + 6;
         
-        dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason:\n\n%s", uin, reason ? reason : "No reason given.");
+        dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason: %s", uin, reason ? reason : "No reason given.");
         data->gc = gc;
         data->uin = uin;
@@ -1737 +1742 @@
         odata->rights.maxdenies = (guint)maxdenies;
 
-//      serv_finish_login(gc);
-
-        if (bud_list_cache_exists(gc))
-                do_import(gc, NULL);
-
         aim_clientready(sess, fr->conn);
 
@@ -2060 +2060 @@
                                                 name = g_strdup(normalize(curitem->name));
                                                 gc->permit = g_slist_append(gc->permit, name);
-                                                build_allow_list();
                                                 tmp++;
                                         }
@@ -2074 +2073 @@
                                                 name = g_strdup(normalize(curitem->name));
                                                 gc->deny = g_slist_append(gc->deny, name);
-                                                build_block_list();
                                                 tmp++;
                                         }
@@ -2096 +2094 @@
         } /* End of for loop */
 
-        if (tmp)
-                do_export(gc);
         aim_ssi_enable(sess, fr->conn);
         
@@ -2282 +2278 @@
                 tm.tm_mday = (int)info->birthday;
                 tm.tm_mon = (int)info->birthmonth-1;
-                tm.tm_year = (int)info->birthyear-1900;
+                tm.tm_year = (int)info->birthyear%100;
                 strftime(date, sizeof(date), "%Y-%m-%d", &tm);
                 info_string_append(str, "\n", _("Birthday"), date);
@@ -2506 +2502 @@
         int ret;
         guint8 len = strlen(message);
+        guint16 flags;
         char *s;
         
@@ -2514 +2511 @@
                 if (*s & 128)
                         break;
-                
+        
+        flags = AIM_CHATFLAGS_NOREFLECT;
+        
         /* Message contains high ASCII chars, time for some translation! */
         if (*s) {
@@ -2521 +2520 @@
                    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 {
@@ -2533 +2534 @@
         }
                 
-        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) {