[331] in BarnOwl Developers
[D-O-H] r476 - / trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:00 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Sun, 24 Dec 2006 22:59:11 -0500 (EST)
Author: nelhage
Date: 2006-12-24 22:59:10 -0500 (Sun, 24 Dec 2006)
New Revision: 476
Modified:
/
trunk/owl/owl.c
Log:
r24493@heretique: nelhage | 2006-12-24 22:59:02 -0500
Moving zephyr initialization later, so that zephyr works again
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24121
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15874
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24493
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15874
Modified: trunk/owl/owl.c
===================================================================
--- trunk/owl/owl.c 2006-12-24 23:26:33 UTC (rev 475)
+++ trunk/owl/owl.c 2006-12-25 03:59:10 UTC (rev 476)
@@ -140,13 +140,6 @@
owl_function_debugmsg("startup: Finished parsing arguments");
-#ifdef HAVE_LIBZEPHYR
- /* zephyr init */
- ret=owl_zephyr_initialize();
- if (!ret)
- owl_global_set_havezephyr(&g);
-#endif
-
/* signal handler */
/*sigact.sa_handler=sig_handler;*/
sigact.sa_sigaction=sig_handler;
@@ -201,6 +194,13 @@
owl_global_set_startupargs(&g, argcsave, argvsave);
owl_global_set_haveaim(&g);
+#ifdef HAVE_LIBZEPHYR
+ /* zephyr init */
+ ret=owl_zephyr_initialize();
+ if (!ret)
+ owl_global_set_havezephyr(&g);
+#endif
+
#if OWL_STDERR_REDIR
/* Do this only after we've started curses up... */
owl_function_debugmsg("startup: doing stderr redirection");
