Changeset 0c502e9


Ignore:
Timestamp:
Jun 22, 2003, 12:56:03 AM (17 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
9381782
Parents:
be0a79f
Message:
Added filter field 'login' which can take the values 'login'
   'logout' or 'none'
Added the perl variable $owl::login, just as above
Updated the 'login' and 'trash' filters appropriately
Fix for checking for DES
Bug fix in using makemsg when no curses window present
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rc3ab155 r0c502e9  
    11$Id$
     2
     32.0.4-pre-2
     4        Added filter field 'login' which can take the values 'login'
     5           'logout' or 'none'
     6        Added the perl variable $owl::login, just as above
     7        Updated the 'login' and 'trash' filters appropriately
     8        Fix for checking for DES
     9        Bug fix in using makemsg when no curses window present
    210
    3112.0.4-pre-1
  • commands.c

    rc3ab155 r0c502e9  
    453453              "syntax would be:\n\n"
    454454              "     filter myfilter -c red ( class ^foobar$ ) or ( class ^quux$ and instance ^bar$ )\n\n"
    455               "Valid matching fields are class, instance, recipient, sender,\n"
    456               "opcode and realm. Valid operations are 'and', 'or' and 'not'.\n"
     455              "Valid matching fields are:\n"
     456              "    sender     -  sender\n"
     457              "    recipient  -  recipient\n"
     458              "    class      -  zephyr class name\n"
     459              "    instance   -  zephyr instance name\n"
     460              "    opcode     -  zephyr opcode\n"
     461              "    realm      -  zephyr realm\n"
     462              "    body       -  message body\n"
     463              "    type       -  message type (zephyr, aim, admin)\n"
     464              "    direction  -  either 'in' 'out' or 'none'\n"
     465              "    login      -  either 'login' 'logout' or 'none'\n"
     466              "Valid operators are:\n"
     467              "    and\n"
     468              "    or\n"
     469              "    not\n"
     470              "And additionally you may use the static values:\n"
     471              "    true\n"
     472              "    false\n"
    457473              "Spaces must be present before and after parenthesis.  If the\n"
    458474              "optional color argument is used it specifies the color that\n"
    459475              "messages matching this filter should be displayed in.\n\n"
    460 
    461476              "SEE ALSO: view, viewclass, viewuser\n"),
    462477
  • filter.c

    r3abf28b r0c502e9  
    6565          !strcasecmp(argv[i], "realm") ||
    6666          !strcasecmp(argv[i], "type") ||
    67           !strcasecmp(argv[i], "direction")) {
     67          !strcasecmp(argv[i], "direction") ||
     68          !strcasecmp(argv[i], "login")) {
    6869        regexstr=owl_util_substitute(argv[i+1], "%me%", ZGetSender());
    6970        owl_filterelement_create_re(fe, argv[i], regexstr);
     
    161162        match="";
    162163      }
     164    } else if (!strcasecmp(field, "login")) {
     165      if (owl_message_is_login(m)) {
     166        match="login";
     167      } else if (owl_message_is_logout(m)) {
     168        match="logout";
     169      } else {
     170        match="none";
     171      }
    163172    }
    164173   
  • functions.c

    r5639bf2 r0c502e9  
    726726  char buff[2048];
    727727
     728  if (!owl_global_get_curs_msgwin(&g)) return;
     729
    728730  va_start(ap, fmt);
    729731  werase(owl_global_get_curs_msgwin(&g));
     
    741743  va_list ap;
    742744  char buff[2048];
     745
     746  if (!owl_global_get_curs_msgwin(&g)) return;
    743747
    744748  va_start(ap, fmt);
  • owl.c

    rbe0a79f r0c502e9  
    170170
    171171  f=owl_malloc(sizeof(owl_filter));
    172   owl_filter_init_fromstring(f, "trash", "class ^mail$ or opcode ^ping$ or type ^admin$ or class ^login$");
     172  owl_filter_init_fromstring(f, "trash", "class ^mail$ or opcode ^ping$ or type ^admin$ or ( not login ^none$ )");
    173173  owl_list_append_element(owl_global_get_filterlist(&g), f);
    174174
     
    182182
    183183  f=owl_malloc(sizeof(owl_filter));
    184   owl_filter_init_fromstring(f, "login", "class ^login$");
     184  owl_filter_init_fromstring(f, "login", "not login ^none$");
    185185  owl_list_append_element(owl_global_get_filterlist(&g), f);
    186186
  • owl.h

    rbe0a79f r0c502e9  
    1717static const char owl_h_fileIdent[] = "$Id$";
    1818
    19 #define OWL_VERSION         2.0.4-pre-1
    20 #define OWL_VERSION_STRING "2.0.4-pre-1"
     19#define OWL_VERSION         2.0.4-pre-2
     20#define OWL_VERSION_STRING "2.0.4-pre-2"
    2121
    2222#define OWL_DEBUG 0
     
    123123#define OWL_CMD_ALIAS_SUMMARY_PREFIX "command alias to: "
    124124
    125 #if defined(HAVE_DES_STRING_TO_KEY) && defined(HAVE_DES_KEY_SCHED) && defined(HAVE_DES_ECB_ENCRYPT)
     125#if defined(HAVE_DES_STRING_TO_KEY) && defined(HAVE_DES_KEY_SCHED) && defined(HAVE_DES_ECB_ENCRYPT_PROTO)
    126126#define OWL_ENABLE_ZCRYPT 1
    127127#endif
  • readconfig.c

    rbd3f232 r0c502e9  
    8686  perl_get_sv("owl::time", TRUE);
    8787  perl_get_sv("owl::host", TRUE);
     88  perl_get_sv("owl::login", TRUE);
    8889  perl_get_av("owl::fields", TRUE);
    8990 
     
    178179  } else {
    179180    sv_setpv(perl_get_sv("owl::direction", TRUE), "unknown");
     181  }
     182
     183  /* set owl::login */
     184  if (owl_message_is_login(m)) {
     185    sv_setpv(perl_get_sv("owl::login", TRUE), "login");
     186  } else if (owl_message_is_logout(m)) {
     187    sv_setpv(perl_get_sv("owl::login", TRUE), "logout");
     188  } else {
     189    sv_setpv(perl_get_sv("owl::login", TRUE), "none");
    180190  }
    181191
  • stylefunc.c

    r5639bf2 r0c502e9  
    460460      owl_fmtext_append_normal(fm, "\n");
    461461      if (tmp) owl_free(tmp);
    462     }
    463 
    464     /* make personal messages bold for smaat users */
    465     if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
    466       owl_fmtext_addattr(fm, OWL_FMTEXT_ATTR_BOLD);
     462
     463      /* make personal messages bold for smaat users */
     464      if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
     465        owl_fmtext_addattr(fm, OWL_FMTEXT_ATTR_BOLD);
     466      }
    467467    }
    468468  } else if (owl_message_is_type_admin(m)) {
Note: See TracChangeset for help on using the changeset viewer.