Changeset b7bb454 for global.c

Timestamp:

Dec 6, 2008, 5:39:49 PM (16 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:

• global.c (modified) (8 diffs)

global.c

@@ -100 +100 @@
   g->aim_screenname_for_filters=NULL;
   g->aim_loggedin=0;
-  owl_timer_create_countdown(&(g->aim_noop_timer), 30);
-  owl_timer_create_countdown(&(g->aim_ignorelogin_timer), 0);
-  owl_timer_create_countdown(&(g->aim_buddyinfo_timer), 60);
   owl_buddylist_init(&(g->buddylist));
-    
+
   g->havezephyr=0;
   g->haveaim=0;
+  g->ignoreaimlogin=0;
   owl_global_set_no_doaimevents(g);
 
@@ -113 +111 @@
 
   owl_zbuddylist_create(&(g->zbuddies));
-  owl_timer_create_countdown(&(g->zephyr_buddycheck_timer), 60*3);
 
   owl_obarray_init(&(g->obarray));
@@ -119 +116 @@
   owl_message_init_fmtext_cache();
   owl_list_create(&(g->dispatchlist));
+  g->timerlist = g_sequence_new(NULL);
 }
 
@@ -814 +812 @@
 }
 
-int owl_global_is_aimnop_time(owl_global *g)
-{
-  if (owl_timer_is_expired(&(g->aim_noop_timer))) return(1);
-  return(0);
-}
-
-void owl_global_aimnop_sent(owl_global *g)
-{
-  owl_timer_reset(&(g->aim_noop_timer));
-}
-
-owl_timer *owl_global_get_aim_login_timer(owl_global *g)
-{
-  return(&(g->aim_ignorelogin_timer));
-}
-
 /* message queue */
 
@@ -902 +884 @@
 }
 
+void owl_global_set_ignore_aimlogin(owl_global *g)
+{
+    g->ignoreaimlogin = 1;
+}
+
+void owl_global_unset_ignore_aimlogin(owl_global *g)
+{
+    g->ignoreaimlogin = 0;
+}
+
+int owl_global_is_ignore_aimlogin(owl_global *g)
+{
+    return g->ignoreaimlogin;
+}
+
 void owl_global_set_havezephyr(owl_global *g)
 {
@@ -911 +908 @@
   if (g->havezephyr) return(1);
   return(0);
-}
-
-owl_timer *owl_global_get_aim_buddyinfo_timer(owl_global *g)
-{
-  return(&(g->aim_buddyinfo_timer));
 }
 
@@ -944 +936 @@
 }
 
-owl_timer *owl_global_get_zephyr_buddycheck_timer(owl_global *g)
-{
-  return(&(g->zephyr_buddycheck_timer));
-}
 
 owl_zbuddylist *owl_global_get_zephyr_buddylist(owl_global *g)
@@ -968 +956 @@
   return &(g->dispatchlist);
 }
+
+GSequence *owl_global_get_timerlist(owl_global *g)
+{
+    return g->timerlist;
+}