[329] in BarnOwl Developers
[D-O-H] r474 - / trunk/owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:04:58 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: Sun, 24 Dec 2006 18:23:39 -0500 (EST)
Author: nelhage
Date: 2006-12-24 18:23:29 -0500 (Sun, 24 Dec 2006)
New Revision: 474
Modified:
/
trunk/owl/perl/modules/jabber.pl
Log:
r15871@phanatique: nelhage | 2006-12-24 18:19:26 -0500
Oops -- fix to make this actually run. No longer create jabber.log if debug mode is off
r15872@phanatique: nelhage | 2006-12-24 18:22:20 -0500
Missed one more change
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24121
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15869
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24121
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15872
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2006-12-24 23:04:42 UTC (rev 473)
+++ trunk/owl/perl/modules/jabber.pl 2006-12-24 23:23:29 UTC (rev 474)
@@ -38,12 +38,12 @@
my $self = shift;
my $jidStr = shift;
- my $client = Net::Jabber::Client->new(
- owl::getvar('debug') eq 'on'
- ? (debuglevel => ? 1 : 0,
- debugfile => 'jabber.log')
- : ()
- );
+ my %args = ();
+ if(owl::getvar('debug') eq 'on') {
+ $args{debuglevel} = 1;
+ $args{debugfile} = 'jabber.log';
+ }
+ my $client = Net::Jabber::Client->new(%args);
$self->{Client}->{$jidStr} = $client;
$self->{Roster}->{$jidStr} = $client->Roster();
@@ -362,7 +362,7 @@
"Error in connect: " . join( " ", @result ) );
}
else {
- ${ $conn->getRosterFromJidStr($jidStr) }->fetch();
+ $conn->getRosterFromJidStr($jidStr)->fetch();
$client->PresenceSend( priority => 1 );
queue_admin_msg("Connected to jabber as $jidStr");
}
