[1162] in BarnOwl Developers
[D-O-H] r1110 - trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:13:39 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, 21 Aug 2008 14:37:38 -0400 (EDT)
Author: nelhage
Date: 2008-08-21 14:37:38 -0400 (Thu, 21 Aug 2008)
New Revision: 1110
Modified:
trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
Log:
BarnOwl/Modules/Jabber.pm: Small stylistic cleanup
Modified: trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
===================================================================
--- trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-08-21 16:01:23 UTC (rev 1109)
+++ trunk/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-08-21 18:37:38 UTC (rev 1110)
@@ -1130,16 +1130,12 @@
sub j2hash {
my $j = shift;
- my %initProps = %{ shift() };
+ my %props = (type => 'jabber',
+ dir => 'none',
+ %{$_[0]});
- my $dir = 'none';
- my %props = ( type => 'jabber' );
+ my $dir = $props{direction};
- foreach my $k (keys %initProps) {
- $dir = $initProps{$k} if ($k eq 'direction');
- $props{$k} = $initProps{$k};
- }
-
my $jtype = $props{jtype} = $j->GetType();
my $from = $j->GetFrom('jid');
my $to = $j->GetTo('jid');
@@ -1186,9 +1182,9 @@
$props{replycmd} = "jwrite $room";
$props{replycmd} .=
" -a " . ( ( $dir eq 'out' ) ? $props{from} : $props{to} );
- if ($props{subject}) {
- $props{replycmd} .= " -s " . $props{subject}
- }
+ if ($props{subject}) {
+ $props{replycmd} .= " -s " . $props{subject}
+ }
if ($dir eq 'out') {
$props{replysendercmd} = "jwrite ".$props{to}." -a ".$props{from};
