Changeset 48609ce

Timestamp:

Jun 6, 2007, 9:06:17 PM (17 years ago)

Author:

Alex Vandiver <alexmv@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

9c590d4

Parents:

f1589b5

git-author:

Alex Vandiver <alexmv@mit.edu> (06/06/07 21:05:25)

git-committer:

Alex Vandiver <alexmv@mit.edu> (06/06/07 21:06:17)

Message:

Don't include self when replying to CC'd messages

Files:

• functions.c (modified) (1 diff)
• message.c (modified) (1 diff)

functions.c

@@ -2087 +2087 @@
         inst=owl_message_get_instance(m);
         to=owl_message_get_recipient(m);
-        cc=owl_message_get_cc(m);
+        cc=owl_message_get_cc_without_recipient(m);
         if (!strcmp(to, "") || !strcmp(to, "*")) {
           to="";

message.c

@@ -660 +660 @@
 }
 
+/* caller must free return value */
+char *owl_message_get_cc_without_recipient(owl_message *m)
+{
+  char *cc, *out, *end, *user;
+
+  cc = owl_message_get_cc(m);
+  out = owl_malloc(strlen(cc));
+  end = out;
+
+  user = strtok(cc, " ");
+  while (user != NULL) {
+    if (strcasecmp(user, short_zuser(owl_message_get_recipient(m))) != 0) {
+      strcpy(end, user);
+      end[strlen(user)] = ' ';
+      end += strlen(user) + 1;
+    }
+    user = strtok(NULL, " ");
+  }
+  end[0] = '\0';
+
+  owl_free(cc);
+  return(out);
+}
+
 int owl_message_get_id(owl_message *m)
 {