Changeset 52a0f14 for owl.c

Timestamp:

Feb 16, 2009, 2:48:16 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:

330c55a

Parents:

5008e51

Message:

stat the zhm asynchronously at startup.

If Zephyr is not present, this means we can continue booting
immediately, rather than waiting a second for the zhm to not
respond. The downside is that you no longer get an error message if
Zephyr is unavailable, but that can be fixed by adding a timeout
timer.

File:

• owl.c (modified) (5 diffs)

owl.c

@@ -43 +43 @@
   owl_editwin *tw;
   owl_popwin *pw;
-  int ret, initialsubs, debug, argcsave, followlast;
+  int ret, debug, argcsave, followlast;
   int newmsgs, nexttimediff;
   struct sigaction sigact;
@@ -65 +65 @@
   tty=NULL;
   debug=0;
-  initialsubs=1;
+  g.load_initial_subs = 1;
 
   setlocale(LC_ALL, "");
@@ -75 +75 @@
   while (argc>0) {
     if (!strcmp(argv[0], "-n")) {
-      initialsubs=0;
+      g.load_initial_subs = 0;
       argv++;
       argc--;
@@ -191 +191 @@
     owl_select_add_dispatch(d);
   }
-  
-#ifdef HAVE_LIBZEPHYR
-  /* zephyr init */
-  ret=owl_zephyr_initialize();
-  if (!ret) {
-    owl_dispatch *d = owl_malloc(sizeof(owl_dispatch));
-    d->fd = ZGetFD();
-    d->cfunc = &owl_zephyr_process_events;
-    d->destroy = NULL;
-    owl_select_add_dispatch(d);
-    owl_global_set_havezephyr(&g);
-  }
-
-#endif
+
+  owl_zephyr_initialize();
 
 #if OWL_STDERR_REDIR
@@ -339 +327 @@
 
   wrefresh(sepwin);
-
-  /* load zephyr subs */
-  if (initialsubs) {
-    int ret2;
-    owl_function_debugmsg("startup: loading initial zephyr subs");
-
-    /* load default subscriptions */
-    ret=owl_zephyr_loaddefaultsubs();
-    
-    /* load subscriptions from subs file */
-    ret2=owl_zephyr_loadsubs(NULL, 0);
-
-    if (ret || ret2) {
-      owl_function_adminmsg("", "Error loading zephyr subscriptions");
-    } else if (ret2!=-1) {
-      owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
-    }
-
-    /* load login subscriptions */
-    if (owl_global_is_loginsubs(&g)) {
-      owl_function_debugmsg("startup: loading login subs");
-      owl_function_loadloginsubs(NULL);
-    }
-  }
 
   /* First buddy check to sync the list without notifications */