[918] in BarnOwl Developers
[D-O-H] r905 - in branches/barnowl_sqlite/owl: . perl/modules/Jabber/lib/BarnOwl/Module
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:11:07 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@MIT.EDU
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Thu, 24 Jan 2008 20:37:00 -0500 (EST)
Author: nelhage
Date: 2008-01-24 20:36:59 -0500 (Thu, 24 Jan 2008)
New Revision: 905
Modified:
branches/barnowl_sqlite/owl/filterelement.c
branches/barnowl_sqlite/owl/message.c
branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
branches/barnowl_sqlite/owl/perlwrap.pm
Log:
Move from `loginout' to `login' globally
Modified: branches/barnowl_sqlite/owl/filterelement.c
===================================================================
--- branches/barnowl_sqlite/owl/filterelement.c 2008-01-24 23:52:06 UTC (rev 904)
+++ branches/barnowl_sqlite/owl/filterelement.c 2008-01-25 01:36:59 UTC (rev 905)
@@ -33,14 +33,6 @@
} else {
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";
- }
} else {
match = owl_message_get_attribute_value(m,field);
if(match == NULL) match = "";
Modified: branches/barnowl_sqlite/owl/message.c
===================================================================
--- branches/barnowl_sqlite/owl/message.c 2008-01-24 23:52:06 UTC (rev 904)
+++ branches/barnowl_sqlite/owl/message.c 2008-01-25 01:36:59 UTC (rev 905)
@@ -203,29 +203,29 @@
void owl_message_set_islogin(owl_message *m)
{
- owl_message_set_attribute(m, "loginout", "login");
+ owl_message_set_attribute(m, "login", "login");
}
void owl_message_set_islogout(owl_message *m)
{
- owl_message_set_attribute(m, "loginout", "logout");
+ owl_message_set_attribute(m, "login", "logout");
}
int owl_message_is_loginout(owl_message *m)
{
char *res;
- res=owl_message_get_attribute_value(m, "loginout");
- if (!res) return(0);
- return(1);
+ res=owl_message_get_attribute_value(m, "login");
+ if(!res) return(0);
+ return strcmp(res, "none");
}
int owl_message_is_login(owl_message *m)
{
char *res;
- res=owl_message_get_attribute_value(m, "loginout");
+ res=owl_message_get_attribute_value(m, "login");
if (!res) return(0);
if (!strcmp(res, "login")) return(1);
return(0);
@@ -236,7 +236,7 @@
{
char *res;
- res=owl_message_get_attribute_value(m, "loginout");
+ res=owl_message_get_attribute_value(m, "login");
if (!res) return(0);
if (!strcmp(res, "logout")) return(1);
return(0);
@@ -420,13 +420,13 @@
void owl_message_mark_delete(owl_message *m)
{
if (m == NULL) return;
- owl_message_set_attribute(m, "deleted", "1");
+ OWL_PERL_CALL_METHOD(m, "delete", /* no args */, "Error in delete: %s", 0, (void)POPs);
}
void owl_message_unmark_delete(owl_message *m)
{
if (m == NULL) return;
- owl_message_set_attribute(m, "deleted", "0");
+ OWL_PERL_CALL_METHOD(m, "undelete", /* no args */, "Error in delete: %s", 0, (void)POPs);
}
char *owl_message_get_zwriteline(owl_message *m)
Modified: branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-01-24 23:52:06 UTC (rev 904)
+++ branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-01-25 01:36:59 UTC (rev 905)
@@ -988,11 +988,11 @@
if ($type eq '' || $type eq 'available') {
$props{body} = "$from is now online. ";
- $props{loginout} = 'login';
+ $props{login} = 'login';
}
else {
$props{body} = "$from is now offline. ";
- $props{loginout} = 'logout';
+ $props{login} = 'logout';
}
$props{replysendercmd} = $props{replycmd} = "jwrite $from -i $sid";
if(BarnOwl::getvar('debug') eq 'on') {
Modified: branches/barnowl_sqlite/owl/perlwrap.pm
===================================================================
--- branches/barnowl_sqlite/owl/perlwrap.pm 2008-01-24 23:52:06 UTC (rev 904)
+++ branches/barnowl_sqlite/owl/perlwrap.pm 2008-01-25 01:36:59 UTC (rev 905)
@@ -374,13 +374,14 @@
deleted => 0,
time => $timestr,
_time => $time,
+ login => 'none',
direction => 'none',
@_);
unless(exists($args{id})) {
my $msglist = BarnOwl::message_list();
$args{id} = $msglist->next_id;
}
- if(exists $args{loginout} && !exists $args{login}) {
+ if(exists $args{loginout}) {
$args{login} = $args{loginout};
delete $args{loginout};
}
@@ -418,7 +419,7 @@
sub body { return shift->{"body"}; }
sub sender { return shift->{"sender"}; }
sub recipient { return shift->{"recipient"}; }
-sub login { return shift->{"login"} || ""; }
+sub login { return shift->{"login"}; }
sub is_private { return shift->{"private"}; }
sub is_login { return shift->login eq "login"; }
