Changeset a5b5d00

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

3f52e14

Parents:

e5da3fe

git-author:

David Benjamin <davidben@mit.edu> (03/11/11 18:12:10)

git-committer:

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

Message:

In duplicated outgoing zephyrs only reply on the relevant recipient

Fixes the other half of bug #63.

Files:

• message.c (modified) (1 diff)
• zwrite.c (modified) (2 diffs)

message.c

@@ -980 +980 @@
   /* Although not strictly the zwriteline, anyone using the unsantized version
    * of it probably has a bug. */
-  replyline = owl_zwrite_get_replyline(z);
+  replyline = owl_zwrite_get_replyline(z, recip_index);
   owl_message_set_zwriteline(m, replyline);
   g_free(replyline);

zwrite.c

@@ -382 +382 @@
  * message field is stripped out. Result should be freed with
  * g_free.
+ *
+ * If not a CC, only the recip_index'th user will be replied to.
  */
-char *owl_zwrite_get_replyline(const owl_zwrite *z)
+char *owl_zwrite_get_replyline(const owl_zwrite *z, int recip_index)
 {
   /* Match ordering in zwrite help. */
@@ -415 +417 @@
     owl_string_append_quoted_arg(buf, z->opcode);
   }
-  for (i = 0; i < owl_list_get_size(&(z->recips)); i++) {
+  if (z->cc) {
+    for (i = 0; i < owl_list_get_size(&(z->recips)); i++) {
+      g_string_append_c(buf, ' ');
+      owl_string_append_quoted_arg(buf, owl_list_get_element(&(z->recips), i));
+    }
+  } else if (recip_index < owl_list_get_size(&(z->recips))) {
     g_string_append_c(buf, ' ');
-    owl_string_append_quoted_arg(buf, owl_list_get_element(&(z->recips), i));
+    owl_string_append_quoted_arg(buf, owl_list_get_element(&(z->recips), recip_index));
   }