Changeset 0c502e9

Timestamp:

Jun 22, 2003, 12:56:03 AM (21 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:

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:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (1 diff)
• filter.c (modified) (2 diffs)
• functions.c (modified) (2 diffs)
• owl.c (modified) (2 diffs)
• owl.h (modified) (2 diffs)
• readconfig.c (modified) (2 diffs)
• stylefunc.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
+
+2.0.4-pre-2
+        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
 
 2.0.4-pre-1

commands.c

@@ -453 +453 @@
               "syntax would be:\n\n"
               "     filter myfilter -c red ( class ^foobar$ ) or ( class ^quux$ and instance ^bar$ )\n\n"
-              "Valid matching fields are class, instance, recipient, sender,\n"
-              "opcode and realm. Valid operations are 'and', 'or' and 'not'.\n"
+              "Valid matching fields are:\n"
+              "    sender     -  sender\n"
+              "    recipient  -  recipient\n"
+              "    class      -  zephyr class name\n"
+              "    instance   -  zephyr instance name\n"
+              "    opcode     -  zephyr opcode\n"
+              "    realm      -  zephyr realm\n"
+              "    body       -  message body\n"
+              "    type       -  message type (zephyr, aim, admin)\n"
+              "    direction  -  either 'in' 'out' or 'none'\n"
+              "    login      -  either 'login' 'logout' or 'none'\n" 
+              "Valid operators are:\n"
+              "    and\n"
+              "    or\n"
+              "    not\n"
+              "And additionally you may use the static values:\n"
+              "    true\n"
+              "    false\n"
               "Spaces must be present before and after parenthesis.  If the\n"
               "optional color argument is used it specifies the color that\n"
               "messages matching this filter should be displayed in.\n\n"
-
               "SEE ALSO: view, viewclass, viewuser\n"),
 

filter.c

@@ -65 +65 @@
           !strcasecmp(argv[i], "realm") ||
           !strcasecmp(argv[i], "type") ||
-          !strcasecmp(argv[i], "direction")) {
+          !strcasecmp(argv[i], "direction") ||
+          !strcasecmp(argv[i], "login")) {
         regexstr=owl_util_substitute(argv[i+1], "%me%", ZGetSender());
         owl_filterelement_create_re(fe, argv[i], regexstr);
@@ -161 +162 @@
         match="";
       }
+    } else if (!strcasecmp(field, "login")) {
+      if (owl_message_is_login(m)) {
+        match="login";
+      } else if (owl_message_is_logout(m)) {
+        match="logout";
+      } else {
+        match="none";
+      }
     }
     

functions.c

@@ -726 +726 @@
   char buff[2048];
 
+  if (!owl_global_get_curs_msgwin(&g)) return;
+
   va_start(ap, fmt);
   werase(owl_global_get_curs_msgwin(&g));
@@ -741 +743 @@
   va_list ap;
   char buff[2048];
+
+  if (!owl_global_get_curs_msgwin(&g)) return;
 
   va_start(ap, fmt);

owl.c

@@ -170 +170 @@
 
   f=owl_malloc(sizeof(owl_filter));
-  owl_filter_init_fromstring(f, "trash", "class ^mail$ or opcode ^ping$ or type ^admin$ or class ^login$");
+  owl_filter_init_fromstring(f, "trash", "class ^mail$ or opcode ^ping$ or type ^admin$ or ( not login ^none$ )");
   owl_list_append_element(owl_global_get_filterlist(&g), f);
 
@@ -182 +182 @@
 
   f=owl_malloc(sizeof(owl_filter));
-  owl_filter_init_fromstring(f, "login", "class ^login$");
+  owl_filter_init_fromstring(f, "login", "not login ^none$");
   owl_list_append_element(owl_global_get_filterlist(&g), f);
 

owl.h

@@ -17 +17 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.4-pre-1
-#define OWL_VERSION_STRING "2.0.4-pre-1"
+#define OWL_VERSION         2.0.4-pre-2
+#define OWL_VERSION_STRING "2.0.4-pre-2"
 
 #define OWL_DEBUG 0
@@ -123 +123 @@
 #define OWL_CMD_ALIAS_SUMMARY_PREFIX "command alias to: "
 
-#if defined(HAVE_DES_STRING_TO_KEY) && defined(HAVE_DES_KEY_SCHED) && defined(HAVE_DES_ECB_ENCRYPT)
+#if defined(HAVE_DES_STRING_TO_KEY) && defined(HAVE_DES_KEY_SCHED) && defined(HAVE_DES_ECB_ENCRYPT_PROTO)
 #define OWL_ENABLE_ZCRYPT 1
 #endif

readconfig.c

@@ -86 +86 @@
   perl_get_sv("owl::time", TRUE);
   perl_get_sv("owl::host", TRUE);
+  perl_get_sv("owl::login", TRUE);
   perl_get_av("owl::fields", TRUE);
   
@@ -178 +179 @@
   } else {
     sv_setpv(perl_get_sv("owl::direction", TRUE), "unknown");
+  }
+
+  /* set owl::login */
+  if (owl_message_is_login(m)) {
+    sv_setpv(perl_get_sv("owl::login", TRUE), "login");
+  } else if (owl_message_is_logout(m)) {
+    sv_setpv(perl_get_sv("owl::login", TRUE), "logout");
+  } else {
+    sv_setpv(perl_get_sv("owl::login", TRUE), "none");
   }
 

stylefunc.c

@@ -460 +460 @@
       owl_fmtext_append_normal(fm, "\n");
       if (tmp) owl_free(tmp);
-    }
-
-    /* make personal messages bold for smaat users */
-    if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
-      owl_fmtext_addattr(fm, OWL_FMTEXT_ATTR_BOLD);
+
+      /* make personal messages bold for smaat users */
+      if (owl_global_is_userclue(&g, OWL_USERCLUE_CLASSES)) {
+        owl_fmtext_addattr(fm, OWL_FMTEXT_ATTR_BOLD);
+      }
     }
   } else if (owl_message_is_type_admin(m)) {