Changeset 65fc0900

Timestamp:

Sep 17, 2002, 7:17:36 PM (22 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

1583c90

Parents:

3a2daac

Message:

You can now use %me% in filters
The built-in personal filter is updated to do so

Files:

• ChangeLog (modified) (1 diff)
• filter.c (modified) (5 diffs)
• help.c (modified) (1 diff)
• owl.c (modified) (1 diff)

ChangeLog

@@ -9 +9 @@
         Added a debugging message indicating the result of topmsg
           calculations
+        You can now use %me% in filters
+        The built-in personal filter is updated to do so
         
 1.2.3

filter.c

@@ -17 +17 @@
   int i, error;
   owl_filterelement *fe;
+  char *regexstr;
    
   f->name=owl_strdup(name);
@@ -23 +24 @@
   f->cachedmsgid=-1;
   owl_list_create(&(f->fes));
-
+  
   /* first take arguments that have to come first */
   /* set the color */
@@ -31 +32 @@
     argv+=2;
   }
-
+  
   /* then deal with the expression */
   for (i=0; i<argc; i++) {
     error=0;
     fe=owl_malloc(sizeof(owl_filterelement));
-
+    
     /* all the 0 argument possibilities */
     if (!strcmp(argv[i], "(")) {
@@ -48 +49 @@
     } else if (!strcasecmp(argv[i], "not")) {
       owl_filterelement_create_not(fe);
-
+      
     } else if (i==argc-1) {
       error=1;
@@ -61 +62 @@
           !strcasecmp(argv[i], "type") ||
           !strcasecmp(argv[i], "direction")) {
-        owl_filterelement_create_re(fe, argv[i], argv[i+1]);
+        regexstr=owl_util_substitute(argv[i+1], "%me%", ZGetSender());
+        owl_filterelement_create_re(fe, argv[i], regexstr);
+        owl_free(regexstr);
         i++;
       } else {

help.c

@@ -55 +55 @@
      "    M-n           View zephyrs to selected conversation\n"
      "    M-N           View zephyrs to selected converstaion by instance\n"
+     "    V             Change to back to home view ('all' by default)\n"
      "    v             Start a view command\n"
      "\n"

owl.c

@@ -136 +136 @@
   /* setup the default filters */
   f=malloc(sizeof(owl_filter));
-  owl_filter_init_fromstring(f, "personal", "( class ^message$ and instance ^personal$ ) or ( type ^admin$ and recipient .+ )"); /* fix to use admintype */
+  owl_filter_init_fromstring(f, "personal", "class ^message$ and instance ^personal$ and ( recipient ^%me%$ or sender ^%me%$ )"); /* fix to use admintype */
   owl_list_append_element(owl_global_get_filterlist(&g), f);