[616] in BarnOwl Developers
[D-O-H] r718 - in trunk/owl/perl/modules/Jabber/lib/BarnOwl: Message Module
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:07:58 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Thu, 24 May 2007 18:16:21 -0400 (EDT)
Author: asedeno
Date: 2007-05-24 18:16:20 -0400 (Thu, 24 May 2007)
New Revision: 718
Modified:
trunk/owl/perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm
trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
Log:
Jabber tweaks:
BarnOwl::Message::Jabber now defines subcontext as subject, much as
BarnOwl::Message::Zephyr maps instance to it.
BarnOwl::Module::Jabber now preserves subjects through replies to
MUCs. Also, fixed a typo in which ``jwrite ... -s foo'' showed up as
``jwrite ... -t foo'' when echoed back to the terminal.
Modified: trunk/owl/perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm 2007-05-19 22:35:30 UTC (rev 717)
+++ trunk/owl/perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm 2007-05-24 22:16:20 UTC (rev 718)
@@ -19,6 +19,7 @@
sub from { shift->{from} };
sub to { shift->{to} };
sub room { shift->{room} };
+sub subject { shift->{subject} };
sub status { shift->{status} }
sub login_extra {
@@ -40,6 +41,10 @@
return shift->room;
}
+sub subcontext {
+ return shift->subject || "";
+}
+
sub smartfilter {
my $self = shift;
my $inst = shift;
Modified: trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2007-05-19 22:35:30 UTC (rev 717)
+++ trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2007-05-24 22:16:20 UTC (rev 718)
@@ -502,7 +502,7 @@
my $cmd = "jwrite $jwrite_to -a $jwrite_from";
$cmd .= " -t $jwrite_thread" if $jwrite_thread;
- $cmd .= " -t $jwrite_subject" if $jwrite_subject;
+ $cmd .= " -s $jwrite_subject" if $jwrite_subject;
BarnOwl::start_edit_win( $cmd, \&process_owl_jwrite );
}
@@ -1096,6 +1096,9 @@
$props{replycmd} = "jwrite $room";
$props{replycmd} .=
" -a " . ( ( $dir eq 'out' ) ? $props{from} : $props{to} );
+ if ($props{subject}) {
+ $props{replycmd} .= " -s " . $props{subject}
+ }
if ($dir eq 'out') {
$props{replysendercmd} = "jwrite ".$props{to}." -a ".$props{from};
