Changeset 4357be8 for owl.c


Ignore:
Timestamp:
Dec 26, 2003, 2:01:32 PM (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:
32eed98
Parents:
bf73bdd
Message:
Don't print an error about loading subs if there is no .zephyr.subs
Do the initial zephyr_buddy_check when pseduologin set to true.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.c

    r81634b6 r4357be8  
    326326  /* load zephyr subs */
    327327  if (initialsubs) {
     328    int ret2;
    328329    owl_function_debugmsg("startup: loading initial zephyr subs");
    329     /* load normal subscriptions */
    330     ret=owl_zephyr_loadsubs(NULL);
    331     if (ret==-1) {
    332       owl_function_adminmsg("", "Error loading zephyr subscriptions, file inaccessable");
    333     } else if (ret!=0) {
     330
     331    /* load default subscriptions */
     332    ret=owl_zephyr_loaddefaultsubs();
     333   
     334    /* load subscriptions from subs file */
     335    ret2=owl_zephyr_loadsubs(NULL);
     336
     337    if (ret || ret2) {
    334338      owl_function_adminmsg("", "Error loading zephyr subscriptions");
    335     }
    336    
    337     if (ret!=-1) {
     339    } else if (ret2!=-1) {
    338340      owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
    339341    }
     
    348350  /* First buddy check to sync the list without notifications */
    349351  owl_function_debugmsg("startup: doing initial zephyr buddy check");
    350   owl_function_zephyr_buddy_check(0);
     352  /* owl_function_zephyr_buddy_check(0); */
    351353
    352354  /* set the startup and default style, based on userclue and presence of a
Note: See TracChangeset for help on using the changeset viewer.