Changeset 4357be8 for owl.c

Timestamp:

Dec 26, 2003, 2:01:32 PM (20 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:

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:

• owl.c (modified) (2 diffs)

owl.c

@@ -326 +326 @@
   /* load zephyr subs */
   if (initialsubs) {
+    int ret2;
     owl_function_debugmsg("startup: loading initial zephyr subs");
-    /* load normal subscriptions */
-    ret=owl_zephyr_loadsubs(NULL);
-    if (ret==-1) {
-      owl_function_adminmsg("", "Error loading zephyr subscriptions, file inaccessable");
-    } else if (ret!=0) {
+
+    /* load default subscriptions */
+    ret=owl_zephyr_loaddefaultsubs();
+    
+    /* load subscriptions from subs file */
+    ret2=owl_zephyr_loadsubs(NULL);
+
+    if (ret || ret2) {
       owl_function_adminmsg("", "Error loading zephyr subscriptions");
-    }
-    
-    if (ret!=-1) {
+    } else if (ret2!=-1) {
       owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
     }
@@ -348 +350 @@
   /* First buddy check to sync the list without notifications */
   owl_function_debugmsg("startup: doing initial zephyr buddy check");
-  owl_function_zephyr_buddy_check(0);
+  /* owl_function_zephyr_buddy_check(0); */
 
   /* set the startup and default style, based on userclue and presence of a