Changeset bd482c3


Ignore:
Timestamp:
Jan 23, 2012, 6:41:30 PM (10 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Branches:
master, release-1.9
Children:
39a531d, b43035e
Parents:
919cbf2
git-author:
Anders Kaseorg <andersk@mit.edu> (10/23/11 00:16:33)
git-committer:
Anders Kaseorg <andersk@mit.edu> (01/23/12 18:41:30)
Message:
Only add outgoing messages for personal part of half-personal messages

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: David Benjamin <davidben@mit.edu>
File:
1 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    recfbdcc rbd482c3  
    216216void owl_function_add_outgoing_zephyrs(const owl_zwrite *z)
    217217{
    218   if (z->cc || owl_zwrite_get_numrecips(z) == 0) {
     218  if (z->cc && owl_zwrite_is_personal(z)) {
    219219    /* create the message */
    220220    owl_message *m = g_new(owl_message, 1);
     
    225225    int i;
    226226    for (i = 0; i < owl_zwrite_get_numrecips(z); i++) {
     227      owl_message *m;
     228
     229      if (!owl_zwrite_recip_is_personal(owl_zwrite_get_recip_n(z, i)))
     230        continue;
     231
    227232      /* create the message */
    228       owl_message *m = g_new(owl_message, 1);
     233      m = g_new(owl_message, 1);
    229234      owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), i);
    230235
     
    373378  owl_function_makemsg("Waiting for ack...");
    374379
    375   /* If it's personal */
    376   if (owl_zwrite_is_personal(z)) {
    377     /* create the outgoing message */
    378     owl_function_add_outgoing_zephyrs(z);
    379   }
     380  /* create the outgoing message */
     381  owl_function_add_outgoing_zephyrs(z);
    380382}
    381383#else
     
    427429  owl_function_makemsg("Waiting for ack...");
    428430
    429   /* If it's personal */
    430   if (owl_zwrite_is_personal(z)) {
    431     /* Create the outgoing message. Restore the un-crypted message for display. */
    432     owl_zwrite_set_message_raw(z, old_msg);
    433     owl_function_add_outgoing_zephyrs(z);
    434   }
     431  /* Create the outgoing message. Restore the un-crypted message for display. */
     432  owl_zwrite_set_message_raw(z, old_msg);
     433  owl_function_add_outgoing_zephyrs(z);
    435434
    436435  /* Clean up. */
Note: See TracChangeset for help on using the changeset viewer.