[400] in BarnOwl Developers
[D-O-H] r537 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:44 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Thu, 18 Jan 2007 19:09:12 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-01-18 19:09:12 -0500 (Thu, 18 Jan 2007)
New Revision: 537
Modified:
trunk/
trunk/owl/owl.c
Log:
r18107@phanatique: nelhage | 2007-01-18 19:09:07 -0500
Run ~/.owl/startup *after* loading perl, so you can jabberlogin,
etc. from within it.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18105
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18107
Modified: trunk/owl/owl.c
===================================================================
--- trunk/owl/owl.c 2007-01-18 22:57:34 UTC (rev 536)
+++ trunk/owl/owl.c 2007-01-19 00:09:12 UTC (rev 537)
@@ -300,10 +300,6 @@
owl_function_debugmsg("startup: doing AIM initialization");
owl_aim_init();
- /* process the startup file */
- owl_function_debugmsg("startup: processing startup file");
- owl_function_source(NULL);
-
/* read the config file */
owl_function_debugmsg("startup: processing config file");
owl_context_set_readconfig(owl_global_get_context(&g));
@@ -333,7 +329,11 @@
owl_function_debugmsg("startup: executing perl startup, if applicable");
perlout = owl_perlconfig_execute("BarnOwl::Hooks::startup();");
if (perlout) owl_free(perlout);
-
+
+ /* process the startup file */
+ owl_function_debugmsg("startup: processing startup file");
+ owl_function_source(NULL);
+
/* hold on to the window names for convenience */
msgwin=owl_global_get_curs_msgwin(&g);
recwin=owl_global_get_curs_recwin(&g);
