[462] in BarnOwl Developers
[D-O-H] r593 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:06:26 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Fri, 9 Feb 2007 11:18:29 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-02-09 11:18:29 -0500 (Fri, 09 Feb 2007)
New Revision: 593
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r18566@phanatique: nelhage | 2007-02-09 11:11:11 -0500
s/owl::/BarnOwl::/g
Reverting svk smerge failure in r590
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18516
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18566
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-02-09 16:11:59 UTC (rev 592)
+++ trunk/owl/perl/modules/jabber.pl 2007-02-09 16:18:29 UTC (rev 593)
@@ -234,7 +234,7 @@
return if ( !$conn->connected() );
$vars{status_changed} = 0;
- my $idletime = owl::getidletime();
+ my $idletime = BarnOwl::getidletime();
if ($idletime >= 900 && $vars{show} eq 'away') {
$vars{show} = 'xa';
$vars{status} = 'Auto extended-away after 15 minutes idle.';
@@ -1010,8 +1010,8 @@
$j->SetSubject( $vars{jwrite}{subject} ) if ( $vars{jwrite}{subject} );
my $m = j2o( $j, { direction => 'out' } );
- if ( $vars{jwrite}{type} ne 'groupchat' && owl::getvar('displayoutgoing') eq 'on') {
- owl::queue_message($m);
+ if ( $vars{jwrite}{type} ne 'groupchat' && BarnOwl::getvar('displayoutgoing') eq 'on') {
+ BarnOwl::queue_message($m);
}
$j->RemoveFrom(); # Kludge to get around gtalk's random bits after the resource.
