Changeset 252a5c2

Timestamp:

Nov 1, 2003, 12:53:53 AM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

7d22e76

Parents:

1db061d

Message:

Print an admin message indicating when subscriptions can
   not be loaded on startup
Fixed bug causing problems with invalid @ colors

Files:

• ChangeLog (modified) (1 diff)
• fmtext.c (modified) (1 diff)
• owl.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.0.12-pre-3
+        Print an admin message indicating when subscriptions can
+           not be loaded on startup
+        Fixed bug causing problems with invalid @ colors
+        
 2.0.12-pre-2
         Set aim_ignorelogin_timer to 15 by default

fmtext.c

@@ -547 +547 @@
           /* set it as the current color */
           curcolor=owl_util_string_to_color(buff);
+          if (curcolor==-1) curcolor=OWL_COLOR_DEFAULT;
           owl_free(buff);
           txtptr=tmpptr+1;

owl.c

@@ -280 +280 @@
   tw=owl_global_get_typwin(&g);
 
-  wrefresh(sepwin);
-
-  /* load zephyr subs */
-  if (initialsubs) {
-    /* load normal subscriptions */
-    ret=owl_zephyr_loadsubs(NULL);
-    if (ret!=-1) {
-      owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
-    }
-
-    /* load login subscriptions */
-    if (owl_global_is_loginsubs(&g)) {
-      owl_function_loadloginsubs(NULL);
-    }
-  }
-
-  /* set the startup and default style, based on userclue and presence of a
-   * formatting function */
-  if (0 != strcmp(owl_global_get_default_style(&g), "__unspecified__")) {
-    /* the style was set by the user: leave it alone */
-  } else if (owl_global_is_config_format(&g)) {
-    owl_global_set_default_style(&g, "perl");
-  } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
-    owl_global_set_default_style(&g, "default");
-  } else {
-    owl_global_set_default_style(&g, "basic");
-  }
-
-  /* zlog in if we need to */
-  if (owl_global_is_startuplogin(&g)) {
-    owl_zephyr_zlog_in();
-  }
-
-  owl_view_set_style(owl_global_get_current_view(&g), 
-                     owl_global_get_style_by_name(&g, owl_global_get_default_style(&g)));   
-
   /* welcome message */
   strcpy(startupmsg, "-------------------------------------------------------------------------\n");
@@ -329 +293 @@
   owl_function_adminmsg("", startupmsg);
   sepbar(NULL);
+
+  wrefresh(sepwin);
+
+  /* load zephyr subs */
+  if (initialsubs) {
+    /* load normal subscriptions */
+    ret=owl_zephyr_loadsubs(NULL);
+    if (ret==-1) {
+      owl_function_adminmsg("", "Error loading subscriptions, file inaccessable");
+    } else if (ret!=0) {
+      owl_function_adminmsg("", "Error loading subscriptions");
+    }
+    
+    if (ret!=-1) {
+      owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
+    }
+
+    /* load login subscriptions */
+    if (owl_global_is_loginsubs(&g)) {
+      owl_function_loadloginsubs(NULL);
+    }
+  }
+
+  /* set the startup and default style, based on userclue and presence of a
+   * formatting function */
+  if (0 != strcmp(owl_global_get_default_style(&g), "__unspecified__")) {
+    /* the style was set by the user: leave it alone */
+  } else if (owl_global_is_config_format(&g)) {
+    owl_global_set_default_style(&g, "perl");
+  } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
+    owl_global_set_default_style(&g, "default");
+  } else {
+    owl_global_set_default_style(&g, "basic");
+  }
+
+  /* zlog in if we need to */
+  if (owl_global_is_startuplogin(&g)) {
+    owl_zephyr_zlog_in();
+  }
+
+  owl_view_set_style(owl_global_get_current_view(&g), 
+                     owl_global_get_style_by_name(&g, owl_global_get_default_style(&g)));   
   
   owl_context_set_interactive(owl_global_get_context(&g));

owl.h

@@ -19 +19 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.12-pre-2
-#define OWL_VERSION_STRING "2.0.12-pre-2"
+#define OWL_VERSION         2.0.12-pre-3
+#define OWL_VERSION_STRING "2.0.12-pre-3"
 
 /* Feature that is being tested to redirect stderr through a pipe. 

zephyr.c

@@ -126 +126 @@
   /* sub with defaults */
   if (ZSubscribeTo(subs,count,0) != ZERR_NONE) {
-    fprintf(stderr, "Error subbing\n");
+    owl_function_error("Error subscribing to zephyr notifications.");
     ret=-2;
   }
@@ -188 +188 @@
   /* sub with defaults */
   if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
-    fprintf(stderr, "Error subbing\n");
+    owl_function_error("Error subscribing to zephyr notifications.");
     ret=-2;
   }