Changeset 25729b2 for functions.c

Timestamp:

Jan 8, 2007, 4:17:55 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:

723f464

Parents:

6beac73

git-author:

Nelson Elhage <nelhage@mit.edu> (01/08/07 15:55:09)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/08/07 16:17:55)

Message:

Adding basic smartnarrow support for jabber, and infrastructure to
make it extensible.

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -2835 +2835 @@
 
   /* narrow personal and login messages to the sender or recip as appropriate */
-  if (owl_message_is_personal(m) || owl_message_is_loginout(m)) {
-    if (owl_message_is_type_zephyr(m)) {
+  if (owl_message_is_type_zephyr(m)) {
+    if (owl_message_is_personal(m) || owl_message_is_loginout(m)) {
       if (owl_message_is_direction_in(m)) {
-        zperson=short_zuser(owl_message_get_sender(m));
+        zperson=short_zuser(owl_message_get_sender(m));
       } else {
-        zperson=short_zuser(owl_message_get_recipient(m));
+        zperson=short_zuser(owl_message_get_recipient(m));
       }
       filtname=owl_function_zuserfilt(zperson);
@@ -2846 +2846 @@
       return(filtname);
     }
-    return(NULL);
-  }
-
-  /* narrow class MESSAGE, instance foo, recip * messages to class, inst */
-  if (!strcasecmp(owl_message_get_class(m), "message") && !owl_message_is_personal(m)) {
-    filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
+
+    /* narrow class MESSAGE, instance foo, recip * messages to class, inst */
+    if (!strcasecmp(owl_message_get_class(m), "message") && !owl_message_is_personal(m)) {
+      filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
+      return(filtname);
+    }
+
+    /* otherwise narrow to the class */
+    if (type==0) {
+      filtname=owl_function_classinstfilt(owl_message_get_class(m), NULL);
+    } else if (type==1) {
+      filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
+    }
     return(filtname);
   }
 
-  /* otherwise narrow to the class */
-  if (type==0) {
-    filtname=owl_function_classinstfilt(owl_message_get_class(m), NULL);
-  } else if (type==1) {
-    filtname=owl_function_classinstfilt(owl_message_get_class(m), owl_message_get_instance(m));
-  }
-  return(filtname);
+  /* pass it off to perl */
+  char *argv[1];
+  if(type) {
+    argv[0] = "-i";
+  };
+  return owl_perlconfig_message_call_method(m, "smartfilter", type ? 1 : 0, argv);
 }