Changeset a352335c for aim.c

Timestamp:

Jul 5, 2003, 7:38:16 AM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

6873455

Parents:

c045455

Message:

Fixed bug in buddy idle time stuff

File:

• aim.c (modified) (7 diffs)

aim.c

@@ -147 +147 @@
   priv->server = "login.oscar.aol.com";
   owl_global_get_aimsess(&g)->aux_data = priv;
-
   
   /* login */
@@ -153 +152 @@
   if (ret) {
     owl_global_set_aimnologgedin(&g);
-    /* printf("login returned %i\n"); */
+    owl_global_set_no_doaimevents(&g);
     return(-1);
   }
+  owl_global_set_doaimevents(&g);
+  return(0);
+}
+
+/* stuff to run once login has been successful */
+void owl_aim_successful_login(char *screenname)
+{
   owl_global_set_aimloggedin(&g, screenname);
-
-  return(0);
+  owl_global_set_doaimevents(&g); /* this should already be on */
+  owl_function_makemsg("%s logged in", screenname);
+
+  owl_function_debugmsg("Successful AIM login for %s", screenname);
+
+  /* start the ingorelogin timer */
+  owl_timer_reset_newstart(owl_global_get_aim_login_timer(&g),
+                           owl_global_get_aim_ignorelogin_timer(&g));
+
 }
 
@@ -166 +179 @@
   logout(owl_global_get_aimsess(&g));
   owl_global_set_aimnologgedin(&g);
-}
-
-void owl_aim_login_error(void)
-{
-  owl_function_makemsg("Authentication error on login");
+  owl_global_set_no_doaimevents(&g);
+}
+
+void owl_aim_login_error(char *message)
+{
+  if (message) {
+    owl_function_makemsg(message);
+  } else {
+    owl_function_makemsg("Authentication error on login");
+  }
   owl_function_beep();
   owl_global_set_aimnologgedin(&g);
+  owl_global_set_no_doaimevents(&g);
 }
 
@@ -365 +384 @@
 
   /* printf("Screen name: %s\n", info->sn); */
+  owl_function_debugmsg("Here with %s", info->sn);
 
   /*
@@ -374 +394 @@
     printf("Error URL: %s\n", info->errorurl);
     */
-    owl_aim_login_error();
-    /* aim_conn_kill(sess, &fr->conn); */
+    if (info->errorcode==0x05) {
+      /* Incorrect nick/password */
+      owl_aim_login_error("Incorrect nickname or password.");
+    } else if (info->errorcode==0x11) {
+      /* Suspended account */
+      owl_aim_login_error("Your account is currently suspended.");
+    } else if (info->errorcode==0x14) {
+      /* service temporarily unavailable */
+      owl_aim_login_error("The AOL Instant Messenger service is temporarily unavailable.");
+    } else if (info->errorcode==0x18) {
+      /* connecting too frequently */
+      owl_aim_login_error("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.");
+    } else if (info->errorcode==0x1c) {
+      /* client too old */
+      owl_aim_login_error("The client version you are using is too old.");
+    } else {
+      owl_aim_login_error(NULL);
+    }
+    aim_conn_kill(sess, &fr->conn);
     return 1;
   }
@@ -395 +432 @@
     return 1;
   }
+  owl_aim_successful_login(info->sn);
   addcb_bos(sess, bosconn);
   aim_sendcookie(sess, bosconn, info->cookie);
-  owl_function_makemsg("%s logged in", info->sn);
   return 1;
 }
@@ -424 +461 @@
 int faimtest_conncomplete(aim_session_t *sess, aim_frame_t *fr, ...)
 {
+  /* owl_aim_successful_login(info->sn); */
+
   return 1;
 }