Changes in zwrite.c [919cbf2:ef4074b]

File:

• zwrite.c (modified) (3 diffs)

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);
-    if (owl_zwrite_recip_is_personal(to))
-      send_ping(to, z->class, z->inst);
+    send_ping(to, z->class, z->inst);
     g_free(to);
   }
@@ -206 +207 @@
   g_free(z->message);
 
-  if (z->cc && owl_zwrite_is_personal(z)) {
+  if (z->recips->len > 0 && z->cc) {
     message = g_string_new("CC: ");
     for (i = 0; i < z->recips->len; i++) {
@@ -337 +338 @@
 }
 
-bool owl_zwrite_recip_is_personal(const char *recipient)
-{
-  return recipient[0] && recipient[0] != '@';
-}
-
-bool owl_zwrite_is_personal(const owl_zwrite *z)
+int owl_zwrite_is_personal(const owl_zwrite *z)
 {
   /* return true if at least one of the recipients is personal */
   int i;
-
-  for (i = 0; i < z->recips->len; i++)
-    if (owl_zwrite_recip_is_personal(z->recips->pdata[i]))
-      return true;
-  return false;
+  char *recip;
+
+  for (i = 0; i < z->recips->len; i++) {
+    recip = z->recips->pdata[i];
+    if (recip[0] != '@') return 1;
+  }
+  return(0);
 }