Changes in protocols/oscar/oscar.c [fc630f9:e8f8b18]

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>
@@ -358 +356 @@
         if (isdigit(*user->username)) {
                 odata->icq = TRUE;
-                /* 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... */
+                /* this is odd but it's necessary for a proper do_import and do_export */
                 gc->password[8] = 0;
         } else {
@@ -385 +381 @@
         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.",user->proto_opt[USEROPT_AUTH]);
+                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.");
         }
         
@@ -1121 +1117 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        if(find_buddy(data->gc, uin) == NULL)
-                show_got_added(data->gc, uin, NULL);
+        show_got_added(data->gc, NULL, uin, NULL, NULL);
         
         g_free(uin);
@@ -1153 +1148 @@
                 reason = msg + 6;
         
-        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.");
+        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.");
         data->gc = gc;
         data->uin = uin;
@@ -1742 +1737 @@
         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++;
                                         }
@@ -2073 +2074 @@
                                                 name = g_strdup(normalize(curitem->name));
                                                 gc->deny = g_slist_append(gc->deny, name);
+                                                build_block_list();
                                                 tmp++;
                                         }
@@ -2094 +2096 @@
         } /* End of for loop */
 
+        if (tmp)
+                do_export(gc);
         aim_ssi_enable(sess, fr->conn);
         
@@ -2278 +2282 @@
                 tm.tm_mday = (int)info->birthday;
                 tm.tm_mon = (int)info->birthmonth-1;
-                tm.tm_year = (int)info->birthyear%100;
+                tm.tm_year = (int)info->birthyear-1900;
                 strftime(date, sizeof(date), "%Y-%m-%d", &tm);
                 info_string_append(str, "\n", _("Birthday"), date);
@@ -2502 +2506 @@
         int ret;
         guint8 len = strlen(message);
-        guint16 flags;
         char *s;
         
@@ -2511 +2514 @@
                 if (*s & 128)
                         break;
-        
-        flags = AIM_CHATFLAGS_NOREFLECT;
-        
+                
         /* Message contains high ASCII chars, time for some translation! */
         if (*s) {
@@ -2520 +2521 @@
                    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 {
@@ -2534 +2533 @@
         }
                 
-        ret = aim_chat_send_im(od->sess, ccon->conn, flags, s, len);
+        ret = aim_chat_send_im(od->sess, ccon->conn, AIM_CHATFLAGS_NOREFLECT, s, len);
                 
         if (s != message) {