[1145] in BarnOwl Developers
[D-O-H] r1094 - in trunk/owl/perl/modules/Jabber/lib/BarnOwl: Message Module
daemon@ATHENA.MIT.EDU (geofft@MIT.EDU)
Thu Oct 29 18:13:28 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
Date: Mon, 28 Jul 2008 09:08:41 -0400 (EDT)
To: dirty-owl-hackers@mit.edu
From: geofft@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Author: geofft
Date: 2008-07-28 09:08:41 -0400 (Mon, 28 Jul 2008)
New Revision: 1094
Modified:
trunk/owl/perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm
trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
Log:
THIS IS AN ANGRY COMMIT
Modified: trunk/owl/perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm 2008-07-26 03:59:40 UTC (rev 1093)
+++ trunk/owl/perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm 2008-07-28 13:08:41 UTC (rev 1094)
@@ -22,6 +22,12 @@
sub subject { shift->{subject} };
sub status { shift->{status} }
+sub login_type {
+ my $self = shift;
+ my $type = $self->jtype;
+ return " ($type)" if $type;
+}
+
sub login_extra {
my $self = shift;
my $show = $self->{show};
Modified: trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-07-26 03:59:40 UTC (rev 1093)
+++ trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-07-28 13:08:41 UTC (rev 1094)
@@ -989,12 +989,12 @@
sub process_presence_available {
my ( $sid, $p ) = @_;
- my $from = $p->GetFrom();
+ my $from = $p->GetFrom('jid')->GetJID('base');
my $to = $p->GetTo();
my $type = $p->GetType();
my %props = (
to => $to,
- from => $from,
+ from => $p->GetFrom(),
recipient => $to,
sender => $from,
type => 'jabber',
@@ -1012,10 +1012,8 @@
$props{body} = "$from is now offline. ";
$props{loginout} = 'logout';
}
- $props{replysendercmd} = $props{replycmd} = "jwrite $from -i $sid";
- if(BarnOwl::getvar('debug') eq 'on') {
- BarnOwl::queue_message(BarnOwl::Message->new(%props));
- }
+ $props{replysendercmd} = $props{replycmd} = "jwrite $from -a $to";
+ BarnOwl::queue_message(BarnOwl::Message->new(%props));
}
sub process_presence_subscribe {
