Changeset 814aa52 for protocols/oscar

Timestamp:

2010-06-03T11:00:45Z (15 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

a6b2f13

Parents:

5f8ab6a9 (diff), f4bcc22 (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 in bitlbee 1.2.6

File:

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

protocols/oscar/oscar.c

@@ -373 +373 @@
         set_t *s;
         
-        s = set_add( &acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc );
+        if (isdigit(acc->user[0])) {
+                set_add(&acc->set, "ignore_auth_requests", "false", set_eval_bool, acc);
+        }
+        
+        s = set_add(&acc->set, "server", AIM_DEFAULT_LOGIN_SERVER, set_eval_account, acc);
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         
-        if (isdigit(acc->user[0])) {
-                s = set_add( &acc->set, "web_aware", "false", set_eval_bool, acc );
+        if(isdigit(acc->user[0])) {
+                s = set_add(&acc->set, "web_aware", "false", set_eval_bool, acc);
                 s->flags |= ACC_SET_OFFLINE_ONLY;
         }
@@ -1212 +1216 @@
  */
 static void gaim_icq_authask(struct im_connection *ic, guint32 uin, char *msg) {
-        struct icq_auth *data = g_new(struct icq_auth, 1);
+        struct icq_auth *data;
         char *reason = NULL;
         char *dialog_msg;
-        
+
+        if (set_getbool(&ic->acc->set, "ignore_auth_requests"))
+                return;
+        
+        data = g_new(struct icq_auth, 1);
+
         if (strlen(msg) > 6)
                 reason = msg + 6;