Changeset aa2f6364

Timestamp:

Oct 12, 2002, 11:46:25 AM (20 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:

8fec514

Parents:

b12c219

Message:

Prettyed up the zwrite line for using 'reply' on a zaway

Files:

• ChangeLog (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

ChangeLog

@@ -5 +5 @@
         Zaway now makes an outgoing message, instead of an admin message
         The 'zlocate' command can now handle multiple users
+        The simple user format for "To:" is in effect again
+        Prettyed up the zwrite line for using 'reply' on a zaway
         
 1.2.6

zephyr.c

@@ -331 +331 @@
   
 void owl_zephyr_zaway(owl_message *m) {
-  char *tmpbuff;
-  
-  /* bail if it doesn't look like a message we should reply to */
+  char *tmpbuff, *myuser;
+  
+  /* bail if it doesn't look like a message we should reply to.  Some
+     of this defined by the way zaway(1) works */
   if (strcasecmp(owl_message_get_class(m), "message")) return;
   if (strcasecmp(owl_message_get_recipient(m), ZGetSender())) return;
@@ -349 +350 @@
               owl_global_get_zaway_msg(&g));
 
+  myuser=short_zuser(owl_message_get_sender(m));
+  if (!strcasecmp(owl_message_get_instance(m), "personal")) {
+    tmpbuff = owl_sprintf("zwrite %s", myuser);
+  } else {
+    tmpbuff = owl_sprintf("zwrite -i %s %s", owl_message_get_instance(m), myuser);
+  }
+  owl_free(myuser);
+
   /* display the message as an admin message in the receive window */
-  tmpbuff = owl_sprintf("zwrite -c %s -i %s %s",
-                        owl_message_get_class(m),
-                        owl_message_get_instance(m),
-                        owl_message_get_sender(m));
   owl_function_make_outgoing_zephyr(owl_global_get_zaway_msg(&g), tmpbuff, "Automated reply:");
   owl_free(tmpbuff);