[657] in BarnOwl Developers
[D-O-H] r749 - trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:08:23 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Wed, 1 Aug 2007 01:52:08 -0400 (EDT)
Author: nelhage
Date: 2007-08-01 01:52:08 -0400 (Wed, 01 Aug 2007)
New Revision: 749
Modified:
trunk/owl/functions.c
Log:
zephyr smartnarrow now uses the ``personal'' filter to decide whether
to narrow to user or not, and the zephyr-user filter now checks for
`filter personal' instead of <message,personal,*>.
closes #2
Modified: trunk/owl/functions.c
===================================================================
--- trunk/owl/functions.c 2007-08-01 05:42:53 UTC (rev 748)
+++ trunk/owl/functions.c 2007-08-01 05:52:08 UTC (rev 749)
@@ -2670,9 +2670,9 @@
f=owl_malloc(sizeof(owl_filter));
argbuff=owl_malloc(strlen(longuser)+1000);
- sprintf(argbuff, "( type ^zephyr$ and ( class ^message$ and instance ^personal$ and ");
+ sprintf(argbuff, "( type ^zephyr$ and filter personal and ");
sprintf(argbuff, "%s ( ( direction ^in$ and sender ^%s$ ) or ( direction ^out$ and recipient ^%s$ ) ) )", argbuff, longuser, longuser);
- sprintf(argbuff, "%s or ( ( class ^login$ ) and ( sender ^%s$ ) ) )", argbuff, longuser);
+ sprintf(argbuff, "%s or ( ( class ^login$ ) and ( sender ^%s$ ) )", argbuff, longuser);
owl_filter_init_fromstring(f, filtname, argbuff);
@@ -2831,7 +2831,7 @@
/* narrow personal and login messages to the sender or recip as appropriate */
if (owl_message_is_type_zephyr(m)) {
- if (owl_message_is_private(m) || owl_message_is_loginout(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));
} else {
