Changeset b43035e for functions.c

Timestamp:

Jan 23, 2012, 6:41:42 PM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

d126a19 (diff), bd482c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge bd482c3a3acaa8cee4b0527fb21a61c2ed52e4e6 into d126a19eb5f8a883b722fb26d21fb7b62b2aedeb

File:

• functions.c (modified) (4 diffs)

functions.c

@@ -216 +216 @@
 void owl_function_add_outgoing_zephyrs(const owl_zwrite *z)
 {
-  if (z->cc || owl_zwrite_get_numrecips(z) == 0) {
+  if (z->cc && owl_zwrite_is_personal(z)) {
     /* create the message */
     owl_message *m = g_new(owl_message, 1);
@@ -225 +225 @@
     int i;
     for (i = 0; i < owl_zwrite_get_numrecips(z); i++) {
+      owl_message *m;
+
+      if (!owl_zwrite_recip_is_personal(owl_zwrite_get_recip_n(z, i)))
+        continue;
+
       /* create the message */
-      owl_message *m = g_new(owl_message, 1);
+      m = g_new(owl_message, 1);
       owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), i);
 
@@ -373 +378 @@
   owl_function_makemsg("Waiting for ack...");
 
-  /* If it's personal */
-  if (owl_zwrite_is_personal(z)) {
-    /* create the outgoing message */
-    owl_function_add_outgoing_zephyrs(z);
-  }
+  /* create the outgoing message */
+  owl_function_add_outgoing_zephyrs(z);
 }
 #else
@@ -427 +429 @@
   owl_function_makemsg("Waiting for ack...");
 
-  /* If it's personal */
-  if (owl_zwrite_is_personal(z)) {
-    /* Create the outgoing message. Restore the un-crypted message for display. */
-    owl_zwrite_set_message_raw(z, old_msg);
-    owl_function_add_outgoing_zephyrs(z);
-  }
+  /* Create the outgoing message. Restore the un-crypted message for display. */
+  owl_zwrite_set_message_raw(z, old_msg);
+  owl_function_add_outgoing_zephyrs(z);
 
   /* Clean up. */