Changes in zephyr.c [987cf3f:8ab1f28]

File:

• zephyr.c (modified) (6 diffs)

zephyr.c

@@ -179 +179 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  if(owl_global_is_havezephyr(&g))
-    return(ZPending());
+  Code_t code;
+  if(owl_global_is_havezephyr(&g)) {
+    if((code = ZPending()) < 0) {
+      owl_function_debugmsg("Error (%s) in ZPending()\n",
+                            error_message(code));
+      return 0;
+    }
+    return code;
+  }
 #endif
   return 0;
@@ -258 +265 @@
 
   if (stat(subsfile, &statbuff) != 0) {
-    owl_free(subsfile);
     if (error_on_nofile == 1)
       return -1;
@@ -374 +380 @@
   subsfile = owl_zephyr_dotfile(".anyone", filename);
 
-  if (stat(subsfile, &statbuff) == -1) {
-    owl_free(subsfile);
+  if (stat(subsfile, &statbuff) == -1)
     return 0;
-  }
 
   ZResetAuthentication();
@@ -852 +856 @@
   char *tmpbuff, *myuser, *to;
   owl_message *mout;
-  owl_zwrite *z;
   
   /* bail if it doesn't look like a message we should reply to.  Some
@@ -888 +891 @@
   owl_free(to);
 
-  z = owl_zwrite_new(tmpbuff);
-  owl_zwrite_set_message(z, owl_global_get_zaway_msg(&g));
-  owl_zwrite_set_zsig(z, "Automated reply:");
-
   /* display the message as an admin message in the receive window */
-  mout=owl_function_make_outgoing_zephyr(z);
+  mout=owl_function_make_outgoing_zephyr(owl_global_get_zaway_msg(&g), tmpbuff, "Automated reply:");
   owl_global_messagequeue_addmsg(&g, mout);
   owl_free(tmpbuff);
-  owl_zwrite_delete(z);
 #endif
 }
@@ -1397 +1395 @@
 #ifdef HAVE_LIBZEPHYR
   ZNotice_t notice;
+  Code_t code;
   owl_message *m=NULL;
 
   while(owl_zephyr_zpending() && zpendcount < OWL_MAX_ZEPHYRGRAMS_TO_PROCESS) {
     if (owl_zephyr_zpending()) {
-      ZReceiveNotice(&notice, NULL);
+      if ((code = ZReceiveNotice(&notice, NULL)) != ZERR_NONE) {
+        owl_function_debugmsg("Error: %s while calling ZReceiveNotice\n",
+                              error_message(code));
+        continue;
+      }
       zpendcount++;