Changeset b43035e

Timestamp:

Jan 23, 2012, 6:41:42 PM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

d126a19 (diff), bd482c3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge bd482c3a3acaa8cee4b0527fb21a61c2ed52e4e6 into d126a19eb5f8a883b722fb26d21fb7b62b2aedeb

Files:

• functions.c (modified) (4 diffs)
• message.c (modified) (1 diff)
• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (1 diff)
• zephyr.c (modified) (4 diffs)
• zwrite.c (modified) (3 diffs)

functions.c

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

message.c

@@ -836 +836 @@
 
   
-  /* set the "isprivate" attribute if it's a private zephyr.
-   ``private'' means recipient is non-empty and doesn't start wit 
-   `@' */
-  if (*n->z_recipient && *n->z_recipient != '@') {
+  /* set the "isprivate" attribute if it's a private zephyr. */
+  if (owl_zwrite_recip_is_personal(n->z_recipient)) {
     owl_message_set_isprivate(m);
   }

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -171 +171 @@
         $class = $self->class;
         $instance = $self->instance;
-        if ($self->recipient eq '*' || $self->recipient eq '') {
-            $to = '';
-        } elsif ($self->recipient =~ /^@/) {
+        if ($self->recipient eq '' || $self->recipient =~ /^@/) {
             $to = $self->recipient;
         } else {

zephyr.c

@@ -697 +697 @@
   Code_t ret;
   ZNotice_t notice;
+  char *zsender = NULL;
     
   memset(&notice, 0, sizeof(notice));
@@ -708 +709 @@
   notice.z_class=zstr(class);
   notice.z_class_inst=zstr(instance);
-  notice.z_sender=NULL;
-  if (!strcmp(recipient, "*") || !strcmp(recipient, "@")) {
+  if (!strcmp(recipient, "@")) {
     notice.z_recipient=zstr("");
-    if (*owl_global_get_zsender(&g))
-        notice.z_sender=zstr(owl_global_get_zsender(&g));
   } else {
     notice.z_recipient=zstr(recipient);
   }
+  if (!owl_zwrite_recip_is_personal(recipient) && *owl_global_get_zsender(&g))
+    notice.z_sender = zsender = long_zuser(owl_global_get_zsender(&g));
   notice.z_default_format=zstr("Class $class, Instance $instance:\nTo: @bold($recipient) at $time $date\nFrom: @bold{$1 <$sender>}\n\n$2");
   if (opcode) notice.z_opcode=zstr(opcode);
@@ -730 +730 @@
   g_free(notice.z_message);
   ZFreeNotice(&notice);
+  g_free(zsender);
   if (ret != ZERR_NONE) {
     owl_function_error("Error sending zephyr: %s", error_message(ret));
@@ -789 +790 @@
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {
     if (retnotice->z_recipient == NULL
-        || *retnotice->z_recipient == 0
-        || *retnotice->z_recipient == '@') {
+        || !owl_zwrite_recip_is_personal(retnotice->z_recipient)) {
       char *buff;
       owl_function_error("No one subscribed to class %s", retnotice->z_class);

zwrite.c

@@ -182 +182 @@
   }
 
-  /* if there are no recipients we won't send a ping, which
-     is what we want */
   for (i = 0; i < z->recips->len; i++) {
     to = owl_zwrite_get_recip_n_with_realm(z, i);
-    send_ping(to, z->class, z->inst);
+    if (owl_zwrite_recip_is_personal(to))
+      send_ping(to, z->class, z->inst);
     g_free(to);
   }
@@ -207 +206 @@
   g_free(z->message);
 
-  if (z->recips->len > 0 && z->cc) {
+  if (z->cc && owl_zwrite_is_personal(z)) {
     message = g_string_new("CC: ");
     for (i = 0; i < z->recips->len; i++) {
@@ -338 +337 @@
 }
 
-int owl_zwrite_is_personal(const owl_zwrite *z)
+bool owl_zwrite_recip_is_personal(const char *recipient)
+{
+  return recipient[0] && recipient[0] != '@';
+}
+
+bool owl_zwrite_is_personal(const owl_zwrite *z)
 {
   /* return true if at least one of the recipients is personal */
   int i;
-  char *recip;
-
-  for (i = 0; i < z->recips->len; i++) {
-    recip = z->recips->pdata[i];
-    if (recip[0] != '@') return 1;
-  }
-  return(0);
+
+  for (i = 0; i < z->recips->len; i++)
+    if (owl_zwrite_recip_is_personal(z->recips->pdata[i]))
+      return true;
+  return false;
 }