Changeset b7bb454 for aim.c

Timestamp:

Dec 6, 2008, 5:39:49 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

7ce4003

Parents:

3ea31b6

git-author:

Nelson Elhage <nelhage@mit.edu> (12/06/08 17:36:19)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/06/08 17:39:49)

Message:

Make owl_timer have a callback and integrate into the select() loop.

Soon we should add support for registering timers from perl, and then
we can eventually remove the perl mainloop hook.

File:

• aim.c (modified) (7 diffs)

aim.c

@@ -130 +130 @@
 }
 
+void owl_aim_send_nop(owl_timer *t, void *data) {
+    if(owl_global_is_doaimevents(&g)) {
+        aim_session_t *sess = owl_global_get_aimsess(&g);
+        aim_flap_nop(sess, aim_getconn_type(sess, AIM_CONN_TYPE_BOS));
+    }
+}
+
 
 int owl_aim_login(char *screenname, char *password)
@@ -194 +201 @@
   owl_function_debugmsg("owl_aim_login: connecting");
 
+  g.aim_nop_timer = owl_select_add_timer(30, 30, owl_aim_send_nop, NULL);
+
   return(0);
+}
+
+void owl_aim_unset_ignorelogin(owl_timer *t, void *data) {      /* noproto */
+    owl_global_unset_ignore_aimlogin(&g);
 }
 
@@ -212 +225 @@
 
   /* start the ingorelogin timer */
-  owl_timer_reset_newstart(owl_global_get_aim_login_timer(&g),
-                           owl_global_get_aim_ignorelogin_timer(&g));
-
-  
+  owl_global_set_ignore_aimlogin(&g);
+  owl_select_add_timer(owl_global_get_aim_ignorelogin_timer(&g),
+                       0, owl_aim_unset_ignorelogin, NULL);
+
   /* aim_ssi_setpresence(owl_global_get_aimsess(&g), 0x00000400); */
   /* aim_bos_setidle(owl_global_get_aimsess(&g), owl_global_get_bosconn(&g), 5000); */
@@ -228 +241 @@
   owl_global_set_aimnologgedin(&g);
   owl_global_set_no_doaimevents(&g);
+  owl_select_remove_timer(g.aim_nop_timer);
 }
 
@@ -246 +260 @@
   owl_global_set_aimnologgedin(&g);
   owl_global_set_no_doaimevents(&g);
+  owl_select_remove_timer(g.aim_nop_timer);
 }
 
@@ -422 +437 @@
   tv.tv_usec = 0;
   waitingconn = aim_select(aimsess, &tv, &selstat);
-
-  if (owl_global_is_aimnop_time(&g)) {
-    aim_flap_nop(aimsess, aim_getconn_type(aimsess, AIM_CONN_TYPE_BOS));
-    owl_global_aimnop_sent(&g);
-  }
 
   if (selstat == -1) {
@@ -2315 +2325 @@
   if (owl_global_is_doaimevents(&g)) {
     owl_aim_process_events();
-
-    if (owl_global_is_aimloggedin(&g)) {
-      if (owl_timer_is_expired(owl_global_get_aim_buddyinfo_timer(&g))) {
-        /* owl_buddylist_request_idletimes(owl_global_get_buddylist(&g)); */
-        owl_timer_reset(owl_global_get_aim_buddyinfo_timer(&g));
-      }
-    }
   }
 }