Changeset 72146c7

Timestamp:

Jun 22, 2011, 12:37:21 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

58f4fb2

Parents:

6b0b4f4

git-author:

David Benjamin <davidben@mit.edu> (05/23/11 23:50:21)

git-committer:

David Benjamin <davidben@mit.edu> (06/22/11 00:37:21)

Message:

Convert pseudologins timer to glib timers

Files:

• variable.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

variable.c

@@ -504 +504 @@
 int owl_variable_pseudologins_set(owl_variable *v, const void *newval)
 {
-  static owl_timer *timer = NULL;
+  static guint timer = 0;
   if (newval) {
     if (*(const int*)newval == 1) {
       owl_function_zephyr_buddy_check(0);
-      if (timer == NULL) {
-        timer = owl_select_add_timer("owl_zephyr_buddycheck_timer",
-                                     180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
+      if (timer == 0) {
+        timer = g_timeout_add_seconds(180, owl_zephyr_buddycheck_timer, NULL);
       }
     } else {
-      if (timer != NULL) {
-        owl_select_remove_timer(timer);
-        timer = NULL;
+      if (timer != 0) {
+        g_source_remove(timer);
+        timer = 0;
       }
     }

zephyr.c

@@ -1432 +1432 @@
 #endif
 
-void owl_zephyr_buddycheck_timer(owl_timer *t, void *data)
+gboolean owl_zephyr_buddycheck_timer(void *data)
 {
   if (owl_global_is_pseudologins(&g)) {
@@ -1440 +1440 @@
     owl_function_debugmsg("Warning: owl_zephyr_buddycheck_timer call pointless; timer should have been disabled");
   }
+  return TRUE;
 }