Changeset ce74deb for message.c

Timestamp:

Apr 22, 2007, 3:12:12 PM (17 years ago)

Author:

Nelson Elhage <nelhage@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:

f178fb5

Parents:

f6c2b3d

git-author:

Nelson Elhage <nelhage@mit.edu> (04/22/07 15:11:07)

git-committer:

Nelson Elhage <nelhage@mit.edu> (04/22/07 15:12:12)

Message:

Improving the private/personal distinction by fixing owl_message_is_personal
* ``private'' means to/or from an individual, not a chat/class/etc.
* ``personal'' means ``matches the personal filter''

File:

• message.c (modified) (3 diffs)

message.c

@@ -550 +550 @@
 int owl_message_is_personal(owl_message *m)
 {
-  if (owl_message_is_type_zephyr(m)) {
-    if (strcasecmp(owl_message_get_class(m), "message")) return(0);
-    if (strcasecmp(owl_message_get_instance(m), "personal")) return(0);
-    if (!strcasecmp(owl_message_get_recipient(m), owl_zephyr_get_sender()) ||
-        !strcasecmp(owl_message_get_sender(m), owl_zephyr_get_sender())) {
-      return(1);
-    }
-  }
-  return(0);
+  owl_filter * f = owl_global_get_filter(&g, "personal");
+  if(!f) {
+      owl_function_error("personal filter is not defined");
+      return (0);
+  }
+  return owl_filter_message_match(f, m);
 }
 
@@ -838 +835 @@
   
   /* set the "isprivate" attribute if it's a private zephyr.
-   ``private'' means recipient is */
+   ``private'' means recipient is non-empty and doesn't start wit 
+   `@' */
   if (*n->z_recipient && *n->z_recipient != '@') {
     owl_message_set_isprivate(m);
@@ -976 +974 @@
     owl_message_set_hostname(m, hostbuff);
   }
+
+  /* set the "isprivate" attribute if it's a private zephyr. */
+  if (owl_zwrite_is_personal(&z)) {
+    owl_message_set_isprivate(m);
+  }
+
   owl_zwrite_free(&z);
-
-  if(owl_message_is_personal(m))
-    owl_message_set_isprivate(m);
 }