Changeset 1cdb459


Ignore:
Timestamp:
Mar 11, 2012, 11:44:39 PM (9 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
release-1.8
Children:
970dafa
Parents:
16ef9ae
git-author:
Anders Kaseorg <andersk@mit.edu> (10/23/11 00:16:33)
git-committer:
David Benjamin <davidben@mit.edu> (03/11/12 23:44:39)
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

    rfe569d7 r1cdb459  
    225225void owl_function_add_outgoing_zephyrs(const owl_zwrite *z)
    226226{
    227   if (z->cc || owl_zwrite_get_numrecips(z) == 0) {
     227  if (z->cc && owl_zwrite_is_personal(z)) {
    228228    /* create the message */
    229229    owl_message *m = g_new(owl_message, 1);
     
    234234    int i;
    235235    for (i = 0; i < owl_zwrite_get_numrecips(z); i++) {
     236      owl_message *m;
     237
     238      if (!owl_zwrite_recip_is_personal(owl_zwrite_get_recip_n(z, i)))
     239        continue;
     240
    236241      /* create the message */
    237       owl_message *m = g_new(owl_message, 1);
     242      m = g_new(owl_message, 1);
    238243      owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), i);
    239244
     
    381386  owl_function_makemsg("Waiting for ack...");
    382387
    383   /* If it's personal */
    384   if (owl_zwrite_is_personal(z)) {
    385     /* create the outgoing message */
    386     owl_function_add_outgoing_zephyrs(z);
    387   }
     388  /* create the outgoing message */
     389  owl_function_add_outgoing_zephyrs(z);
    388390}
    389391#else
     
    435437  owl_function_makemsg("Waiting for ack...");
    436438
    437   /* If it's personal */
    438   if (owl_zwrite_is_personal(z)) {
    439     /* Create the outgoing message. Restore the un-crypted message for display. */
    440     owl_zwrite_set_message_raw(z, old_msg);
    441     owl_function_add_outgoing_zephyrs(z);
    442   }
     439  /* Create the outgoing message. Restore the un-crypted message for display. */
     440  owl_zwrite_set_message_raw(z, old_msg);
     441  owl_function_add_outgoing_zephyrs(z);
    443442
    444443  /* Clean up. */
Note: See TracChangeset for help on using the changeset viewer.