Changeset a01ed7c for perl/modules/Jabber/lib

Timestamp:

Oct 27, 2009, 2:15:08 PM (14 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

7ca5d3e

Parents:

e7f5970 (diff), f1a2736 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'io_dispatch_rewrite'

Location:

perl/modules/Jabber/lib/BarnOwl/Module

Files:

• Jabber.pm (modified) (1 diff)
• Jabber/ConnectionManager.pm (modified) (2 diffs)

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -471 +471 @@
                 $conn->renameConnection($jidStr, $fullJid);
                 queue_admin_msg("Connected to jabber as $fullJid");
-                # The remove_dispatch() method is called from the
+                # The remove_io_dispatch() method is called from the
                 # ConnectionManager's removeConnection() method.
                 $client->{fileno} = $client->getSocket()->fileno();
                 #queue_admin_msg("Connected to jabber as $fullJid ($client->{fileno})");
-                BarnOwl::add_dispatch($client->{fileno}, sub { $client->OwlProcess($fullJid) });
+                BarnOwl::add_io_dispatch($client->{fileno}, 'r', sub { $client->OwlProcess($fullJid) });
 
                 # populate completion from roster.

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm

@@ -37 +37 @@
     return 0 unless exists $self->{$jidStr};
 
-    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
+    BarnOwl::remove_io_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
     $self->{$jidStr}->{Client}->Disconnect()
       if $self->{$jidStr}->{Client};
@@ -55 +55 @@
     }
 
-    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
+    BarnOwl::remove_io_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
     $self->{$jidStr}->{Client}->Disconnect()
       if $self->{$jidStr}->{Client};