Changes in functions.c [bd482c3:7803326]

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_is_personal(z)) {
+  if (z->cc || owl_zwrite_get_numrecips(z) == 0) {
     /* 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 */
-      m = g_new(owl_message, 1);
+      owl_message *m = g_new(owl_message, 1);
       owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), i);
 
@@ -378 +373 @@
   owl_function_makemsg("Waiting for ack...");
 
-  /* create the outgoing message */
-  owl_function_add_outgoing_zephyrs(z);
+  /* If it's personal */
+  if (owl_zwrite_is_personal(z)) {
+    /* create the outgoing message */
+    owl_function_add_outgoing_zephyrs(z);
+  }
 }
 #else
@@ -429 +427 @@
   owl_function_makemsg("Waiting for ack...");
 
-  /* 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. */
+  /* 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);
+  }
+
+  /* free the zwrite */
   g_free(cryptmsg);
-  g_free(old_msg);
 }