[343] in BarnOwl Developers
[D-O-H] r488 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:07 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: Mon, 8 Jan 2007 13:09:48 -0500 (EST)
Author: nelhage
Date: 2007-01-08 13:09:47 -0500 (Mon, 08 Jan 2007)
New Revision: 488
Modified:
trunk/
trunk/owl/message.c
trunk/owl/owl.c
Log:
r17857@phanatique: nelhage | 2007-01-08 13:09:37 -0500
Fixing the ``personal'' filter to be more generic. Now works with
jabber.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17856
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17857
Modified: trunk/owl/message.c
===================================================================
--- trunk/owl/message.c 2007-01-08 18:09:44 UTC (rev 487)
+++ trunk/owl/message.c 2007-01-08 18:09:47 UTC (rev 488)
@@ -291,7 +291,7 @@
void owl_message_set_isprivate(owl_message *m)
{
- owl_message_set_attribute(m, "isprivate", "");
+ owl_message_set_attribute(m, "isprivate", "true");
}
int owl_message_is_private(owl_message *m)
@@ -990,6 +990,9 @@
owl_message_set_hostname(m, hostbuff);
}
owl_zwrite_free(&z);
+
+ if(owl_message_is_personal(m))
+ owl_message_set_isprivate(m);
}
void owl_message_pretty_zsig(owl_message *m, char *buff)
Modified: trunk/owl/owl.c
===================================================================
--- trunk/owl/owl.c 2007-01-08 18:09:44 UTC (rev 487)
+++ trunk/owl/owl.c 2007-01-08 18:09:47 UTC (rev 488)
@@ -246,10 +246,7 @@
* included. Also, there should be an %aimme% */
owl_function_debugmsg("startup: creating default filters");
f=owl_malloc(sizeof(owl_filter));
- owl_filter_init_fromstring(f, "personal", "( type ^zephyr$ "
- "and class ^message$ and instance ^personal$ "
- "and ( recipient ^%me%$ or sender ^%me%$ ) ) "
- "or ( type ^aim$ and login ^none$ )");
+ owl_filter_init_fromstring(f, "personal", "isprivate ^true$");
owl_list_append_element(owl_global_get_filterlist(&g), f);
f=owl_malloc(sizeof(owl_filter));
