Changeset e5da3fe for functions.c

Timestamp:

Mar 24, 2011, 4:24:25 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

a5b5d00

Parents:

283ff1e

git-author:

DD Liu <liudi@mit.edu> (11/06/10 22:35:54)

git-committer:

David Benjamin <davidben@mit.edu> (03/24/11 16:24:25)

Message:

Create per-recipient copies of outgoing messages for non-CC'd personals

Fixes bug #63.

[davidben@mit.edu: Fix up comment, rebase to master]
[davidben@mit.edu: Address nitpicks]

File:

• functions.c (modified) (7 diffs)

functions.c

@@ -250 +250 @@
 }
 
-/* Create an outgoing zephyr message and return a pointer to it.  Does
- * not put it on the global queue, use owl_global_messagequeue_addmsg() for
- * that.
+/* Queues outgoing zephyrs; if z sends to n people, queue n messages
+ * (except in case of cc). If there are no recipients queues 1
+ * message.
  */
-owl_message *owl_function_make_outgoing_zephyr(const owl_zwrite *z)
-{
-  owl_message *m;
-
-  /* create the message */
-  m=g_new(owl_message, 1);
-  owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z));
-
-  return(m);
+void owl_function_add_outgoing_zephyrs(const owl_zwrite *z)
+{
+  if (z->cc || owl_zwrite_get_numrecips(z) == 0) {
+    /* create the message */
+    owl_message *m = g_new(owl_message, 1);
+    owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), 0);
+
+    owl_global_messagequeue_addmsg(&g, m);
+  } else {
+    int i;
+    for (i = 0; i < owl_zwrite_get_numrecips(z); i++) {
+      /* create the message */
+      owl_message *m = g_new(owl_message, 1);
+      owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), i);
+
+      owl_global_messagequeue_addmsg(&g, m);
+    }
+  }
 }
 
@@ -268 +277 @@
  * message or NULL if we're not logged into AIM (and thus unable to
  * create the message).  Does not put it on the global queue.  Use
- * owl_global_messagequeue_addmsg() for that .
+ * owl_global_messagequeue_addmsg() for that.
  */
 owl_message *owl_function_make_outgoing_aim(const char *body, const char *to)
@@ -378 +387 @@
 }
 
-/* send, log and display an outgoing zephyr.  If 'msg' is NULL
- * the message is expected to be set from the zwrite line itself
+/* send, log and display outgoing zephyrs.  If 'msg' is NULL the
+ * message is expected to be set from the zwrite line itself
  */
 #ifdef HAVE_LIBZEPHYR
 void owl_function_zwrite(owl_zwrite *z, const char *msg)
 {
-  owl_message *m;
   int ret;
 
@@ -407 +415 @@
   if (owl_zwrite_is_personal(z)) {
     /* create the outgoing message */
-    m=owl_function_make_outgoing_zephyr(z);
-
-    if (m) {
-      owl_global_messagequeue_addmsg(&g, m);
-    } else {
-      owl_function_error("Could not create outgoing zephyr message");
-    }
+    owl_function_add_outgoing_zephyrs(z);
   }
 }
@@ -421 +423 @@
 #endif
 
-/* send, log and display an outgoing zcrypt zephyr.  If 'msg' is NULL
+/* send, log and display outgoing zcrypt zephyrs.  If 'msg' is NULL
  * the message is expected to be set from the zwrite line itself
  */
@@ -427 +429 @@
 {
   char *cryptmsg;
-  owl_message *m;
   const char *argv[7];
   char *zcrypt;
@@ -469 +470 @@
     /* Create the outgoing message. Restore the un-crypted message for display. */
     owl_zwrite_set_message_raw(z, old_msg);
-    m=owl_function_make_outgoing_zephyr(z);
-    if (m) {
-      owl_global_messagequeue_addmsg(&g, m);
-    } else {
-      owl_function_error("Could not create outgoing zephyr message");
-    }
+    owl_function_add_outgoing_zephyrs(z);
   }