Changeset d73e3af

Timestamp:

May 16, 2009, 3:37:35 AM (16 years ago)

Author:

Alex Dehnert <alex@kronborg.(none)>

Branches:

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

Children:

7bf51d5

Parents:

315babf

git-author:

Alexander W Dehnert <adehnert@mit.edu> (05/16/09 01:56:52)

git-committer:

Alex Dehnert <alex@kronborg.(none)> (05/16/09 03:37:35)

Message:

Improve handling of outgoing instanced personals

Make Barnowl's Zephyr support handle personals
with a class and/or instance better, by
displaying suitable "Message sent to <foo> on
-c <bar> -i <baz>" messages.

Current behavior:
zwrite -i test adehnert
Message sent to -c message -i test

which suggests that the message wasn't a
personal message.

File:

• zephyr.c (modified) (1 diff)

zephyr.c

@@ -709 +709 @@
     if (!strcasecmp(retnotice->z_opcode, "ping")) {
       return;
-    } else if (!strcasecmp(retnotice->z_class, "message") &&
-               !strcasecmp(retnotice->z_class_inst, "personal")) {
-      tmp=short_zuser(retnotice->z_recipient);
-      owl_function_makemsg("Message sent to %s.", tmp);
-      free(tmp);
     } else {
-      owl_function_makemsg("Message sent to -c %s -i %s\n", retnotice->z_class, retnotice->z_class_inst);
+      if (strcasecmp(retnotice->z_recipient, ""))
+      { // personal
+        tmp=short_zuser(retnotice->z_recipient);
+        if(!strcasecmp(retnotice->z_class, "message") &&
+           !strcasecmp(retnotice->z_class_inst, "personal")) {
+          owl_function_makemsg("Message sent to %s.", tmp);
+        } else if(!strcasecmp(retnotice->z_class, "message")) { // instanced, but not classed, personal
+          owl_function_makemsg("Message sent to %s on -i %s\n", tmp, retnotice->z_class_inst);
+        } else { // classed personal
+          owl_function_makemsg("Message sent to %s on -c %s -i %s\n", tmp, retnotice->z_class, retnotice->z_class_inst);
+        }
+        free(tmp);
+      } else {
+        // class / instance message
+          owl_function_makemsg("Message sent to -c %s -i %s\n", retnotice->z_class, retnotice->z_class_inst);
+      }
     }
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {