Changeset 252a5c2


Ignore:
Timestamp:
Nov 1, 2003, 12:53:53 AM (17 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
master, barnowl_perlaim, debian, owl, 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:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r1db061d r252a5c2  
    11$Id$
    22
     32.0.12-pre-3
     4        Print an admin message indicating when subscriptions can
     5           not be loaded on startup
     6        Fixed bug causing problems with invalid @ colors
     7       
    382.0.12-pre-2
    49        Set aim_ignorelogin_timer to 15 by default
  • fmtext.c

    r12c35df r252a5c2  
    547547          /* set it as the current color */
    548548          curcolor=owl_util_string_to_color(buff);
     549          if (curcolor==-1) curcolor=OWL_COLOR_DEFAULT;
    549550          owl_free(buff);
    550551          txtptr=tmpptr+1;
  • owl.c

    r8c92848 r252a5c2  
    280280  tw=owl_global_get_typwin(&g);
    281281
    282   wrefresh(sepwin);
    283 
    284   /* load zephyr subs */
    285   if (initialsubs) {
    286     /* load normal subscriptions */
    287     ret=owl_zephyr_loadsubs(NULL);
    288     if (ret!=-1) {
    289       owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
    290     }
    291 
    292     /* load login subscriptions */
    293     if (owl_global_is_loginsubs(&g)) {
    294       owl_function_loadloginsubs(NULL);
    295     }
    296   }
    297 
    298   /* set the startup and default style, based on userclue and presence of a
    299    * formatting function */
    300   if (0 != strcmp(owl_global_get_default_style(&g), "__unspecified__")) {
    301     /* the style was set by the user: leave it alone */
    302   } else if (owl_global_is_config_format(&g)) {
    303     owl_global_set_default_style(&g, "perl");
    304   } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
    305     owl_global_set_default_style(&g, "default");
    306   } else {
    307     owl_global_set_default_style(&g, "basic");
    308   }
    309 
    310   /* zlog in if we need to */
    311   if (owl_global_is_startuplogin(&g)) {
    312     owl_zephyr_zlog_in();
    313   }
    314 
    315   owl_view_set_style(owl_global_get_current_view(&g),
    316                      owl_global_get_style_by_name(&g, owl_global_get_default_style(&g)));   
    317 
    318282  /* welcome message */
    319283  strcpy(startupmsg, "-------------------------------------------------------------------------\n");
     
    329293  owl_function_adminmsg("", startupmsg);
    330294  sepbar(NULL);
     295
     296  wrefresh(sepwin);
     297
     298  /* load zephyr subs */
     299  if (initialsubs) {
     300    /* load normal subscriptions */
     301    ret=owl_zephyr_loadsubs(NULL);
     302    if (ret==-1) {
     303      owl_function_adminmsg("", "Error loading subscriptions, file inaccessable");
     304    } else if (ret!=0) {
     305      owl_function_adminmsg("", "Error loading subscriptions");
     306    }
     307   
     308    if (ret!=-1) {
     309      owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
     310    }
     311
     312    /* load login subscriptions */
     313    if (owl_global_is_loginsubs(&g)) {
     314      owl_function_loadloginsubs(NULL);
     315    }
     316  }
     317
     318  /* set the startup and default style, based on userclue and presence of a
     319   * formatting function */
     320  if (0 != strcmp(owl_global_get_default_style(&g), "__unspecified__")) {
     321    /* the style was set by the user: leave it alone */
     322  } else if (owl_global_is_config_format(&g)) {
     323    owl_global_set_default_style(&g, "perl");
     324  } else if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
     325    owl_global_set_default_style(&g, "default");
     326  } else {
     327    owl_global_set_default_style(&g, "basic");
     328  }
     329
     330  /* zlog in if we need to */
     331  if (owl_global_is_startuplogin(&g)) {
     332    owl_zephyr_zlog_in();
     333  }
     334
     335  owl_view_set_style(owl_global_get_current_view(&g),
     336                     owl_global_get_style_by_name(&g, owl_global_get_default_style(&g)));   
    331337 
    332338  owl_context_set_interactive(owl_global_get_context(&g));
  • owl.h

    rcee1f25 r252a5c2  
    1919static const char owl_h_fileIdent[] = "$Id$";
    2020
    21 #define OWL_VERSION         2.0.12-pre-2
    22 #define OWL_VERSION_STRING "2.0.12-pre-2"
     21#define OWL_VERSION         2.0.12-pre-3
     22#define OWL_VERSION_STRING "2.0.12-pre-3"
    2323
    2424/* Feature that is being tested to redirect stderr through a pipe.
  • zephyr.c

    r12c35df r252a5c2  
    126126  /* sub with defaults */
    127127  if (ZSubscribeTo(subs,count,0) != ZERR_NONE) {
    128     fprintf(stderr, "Error subbing\n");
     128    owl_function_error("Error subscribing to zephyr notifications.");
    129129    ret=-2;
    130130  }
     
    188188  /* sub with defaults */
    189189  if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
    190     fprintf(stderr, "Error subbing\n");
     190    owl_function_error("Error subscribing to zephyr notifications.");
    191191    ret=-2;
    192192  }
Note: See TracChangeset for help on using the changeset viewer.