Changeset 44f32fb for zephyr.c

Timestamp:

Jan 10, 2008, 1:16:33 AM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

1151f0b

Parents:

d536e72

Message:

Handle zephyrs to users on non -c message better (fixes #39)

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -563 +563 @@
     }
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {
-    if (strcasecmp(retnotice->z_class, "message")) {
+    if (retnotice->z_recipient == NULL
+        || *retnotice->z_recipient == NULL
+        || *retnotice->z_recipient == '@') {
       char buff[1024];
-      owl_function_error("No one subscribed to class class %s", retnotice->z_class);
+      owl_function_error("No one subscribed to class %s", retnotice->z_class);
       sprintf(buff, "Could not send message to class %s: no one subscribed.\n", retnotice->z_class);
       owl_function_adminmsg("", buff);
@@ -571 +573 @@
       char buff[1024];
       tmp = short_zuser(retnotice->z_recipient);
-      owl_function_error("%s: Not logged in or subscribing to messages.", tmp);
-      sprintf(buff, "Could not send message to %s: not logged in or subscribing to messages.\n", tmp);
+      owl_function_error("%s: Not logged in or subscribing.", tmp);
+      sprintf(buff, "Could not send message to %s: not logged in or subscribing to", tmp);
+      if(strcmp(retnotice->z_class, "message")) {
+        sprintf(buff, "%s class %s, instance %s.\n", buff,
+                retnotice->z_class,
+                retnotice->z_class_inst);
+      } else {
+        sprintf(buff, "%s messages.\n", buff);
+      }
       owl_function_adminmsg("", buff);
       owl_log_outgoing_zephyr_error(tmp, buff);