Changeset ce7db4d for functions.c

Timestamp:

Jun 24, 2003, 11:12:09 PM (21 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:

658dc2f

Parents:

723c427

Message:

zwrite -m now logs and displays an outgoing message
zwrite -s now works

File:

• functions.c (modified) (3 diffs)

functions.c

@@ -302 +302 @@
 }
 
-void owl_function_zwrite(char *line)
+/* send, log and display an outgoing zephyr.  If 'msg' is NULL
+ * the message is expected to be set from the zwrite line itself
+ */
+void owl_function_zwrite(char *line, char *msg)
 {
   owl_zwrite z;
   int i, j;
+  char *mymsg;
 
   /* create the zwrite and send the message */
   owl_zwrite_create_from_line(&z, line);
-  owl_zwrite_send_message(&z, owl_editwin_get_text(owl_global_get_typwin(&g)));
+  if (msg) {
+    owl_zwrite_set_message(&z, msg);
+  }
+
+  owl_zwrite_send_message(&z);
   owl_function_makemsg("Waiting for ack...");
+
+  mymsg=owl_zwrite_get_message(&z);
 
   /* display the message as an outgoing message in the receive window */
   if (owl_global_is_displayoutgoing(&g) && owl_zwrite_is_personal(&z)) {
-    owl_function_make_outgoing_zephyr(owl_editwin_get_text(owl_global_get_typwin(&g)), line, owl_zwrite_get_zsig(&z));
+    owl_function_make_outgoing_zephyr(mymsg, line, owl_zwrite_get_zsig(&z));
   }
 
@@ -321 +331 @@
     j=owl_zwrite_get_numrecips(&z);
     for (i=0; i<j; i++) {
-      owl_log_outgoing_zephyr(owl_zwrite_get_recip_n(&z, i),
-                       owl_editwin_get_text(owl_global_get_typwin(&g)));
+      owl_log_outgoing_zephyr(owl_zwrite_get_recip_n(&z, i), mymsg);
     }
   }
@@ -1073 +1082 @@
   buff=owl_global_get_buffercommand(&g);
   if (!strncmp(buff, "zwrite ", 7)) {
-    owl_function_zwrite(buff);
+    owl_function_zwrite(buff, owl_editwin_get_text(owl_global_get_typwin(&g)));
   } else if (!strncmp(buff, "aimwrite ", 9)) {
     owl_function_aimwrite(buff+9);