[381] in BarnOwl Developers
[D-O-H] r522 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:32 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Thu, 11 Jan 2007 17:29:15 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-01-11 17:29:14 -0500 (Thu, 11 Jan 2007)
New Revision: 522
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r17947@phanatique: nelhage | 2007-01-11 16:18:17 -0500
Adding a BarnOwl::Jabber::Connection class where we can add extensions
to Net::Jabber that we need.
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:17945
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17947
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-11 21:13:37 UTC (rev 521)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-11 22:29:14 UTC (rev 522)
@@ -27,6 +27,24 @@
################################################################################
################################################################################
+package BarnOwl::Jabber::Connection;
+
+use base qw(Net::Jabber::Client);
+
+sub new {
+ my $class = shift;
+
+ my %args = ();
+ if(BarnOwl::getvar('debug') eq 'on') {
+ $args{debuglevel} = 1;
+ $args{debugfile} = 'jabber.log';
+ }
+ my $self = $class->SUPER::new(%args);
+ return $self
+}
+
+################################################################################
+################################################################################
package BarnOwl::Jabber::ConnectionManager;
sub new {
my $class = shift;
@@ -37,12 +55,7 @@
my $self = shift;
my $jidStr = shift;
- my %args = ();
- if(BarnOwl::getvar('debug') eq 'on') {
- $args{debuglevel} = 1;
- $args{debugfile} = 'jabber.log';
- }
- my $client = Net::Jabber::Client->new(%args);
+ my $client = BarnOwl::Jabber::Connection->new;
$self->{Client}->{$jidStr} = $client;
$self->{Roster}->{$jidStr} = $client->Roster();
@@ -119,7 +132,7 @@
}
################################################################################
-package owl_jabber;
+package BarnOwl::Jabber;
our $conn = new BarnOwl::Jabber::ConnectionManager unless $conn;;
our %vars;
