Changeset b6c067a for owl.c

Timestamp:

Feb 16, 2007, 1:37:44 AM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

6e6ded7

Parents:

3f21b8e

git-author:

Nelson Elhage <nelhage@mit.edu> (02/15/07 23:16:22)

git-committer:

Nelson Elhage <nelhage@mit.edu> (02/16/07 01:37:44)

Message:

Moving the default style into perl, and reorganizing things so we can
bootstrap the style into place in time.

File:

• owl.c (modified) (2 diffs)

owl.c

@@ -227 +227 @@
   }
 
+  /* Initialize perl */
+  owl_function_debugmsg("startup: processing config file");
+  owl_context_set_readconfig(owl_global_get_context(&g));
+  perlerr=owl_perlconfig_initperl(configfile);
+  if (perlerr) {
+    endwin();
+    owl_function_error("Internal perl error: %s\n", perlerr);
+    fprintf(stderr, "Internal perl error: %s\n", perlerr);
+    fflush(stderr);
+    printf("Internal perl error: %s\n", perlerr);
+    fflush(stdout);
+    exit(1);
+  }
+
   /* setup the built-in styles */
   owl_function_debugmsg("startup: creating built-in styles");
-  s=owl_malloc(sizeof(owl_style));
-  owl_style_create_internal(s, "default", &owl_stylefunc_default, "Default message formatting");
-  owl_global_add_style(&g, s);
 
   s=owl_malloc(sizeof(owl_style));
@@ -304 +315 @@
   owl_function_debugmsg("startup: doing AIM initialization");
   owl_aim_init();
-
-  /* read the config file */
-  owl_function_debugmsg("startup: processing config file");
-  owl_context_set_readconfig(owl_global_get_context(&g));
-  perlerr=owl_perlconfig_readconfig(configfile);
-  if (perlerr) {
-    endwin();
-    owl_function_error("Error parsing configfile: %s\n", perlerr);
-    fprintf(stderr, "\nError parsing configfile: %s\n", perlerr);
-    fflush(stderr);
-    printf("\nError parsing configfile: %s\n", perlerr);
-    fflush(stdout);
-    exit(1);
-  }
 
   /* if the config defines a formatting function, add 'perl' as a style */