Changeset 0dbb7d2 for perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

Timestamp:

Dec 22, 2009, 6:37:38 PM (13 years ago)

Author:

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

Branches:

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

Children:

a2a5236

Parents:

6396c1e

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (12/22/09 01:15:39)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (12/22/09 18:37:38)

Message:

Factor out some common jabber connect-time code

Call it upon successful connection and reconnection.

File:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)

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

@@ -465 +465 @@
                     }
                 );
-                my $roster = $conn->getRosterFromJID($jidStr);
-                $roster->fetch();
-                $client->PresenceSend( priority => 1 );
-                my $fullJid = $client->{SESSION}->{FULLJID} || $jidStr;
-                $conn->renameConnection($jidStr, $fullJid);
-                queue_admin_msg("Connected to jabber as $fullJid");
-                # 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_io_dispatch($client->{fileno}, 'r', sub { $client->OwlProcess($fullJid) });
-
-                # populate completion from roster.
-                for my $buddy ( $roster->jids('all') ) {
-                    my %jq  = $roster->query($buddy);
-                    my $name = $jq{name} || $buddy->GetUserID();
-                    $completion_jids{$name} = 1;
-                    $completion_jids{$buddy->GetJID()} = 1;
-                }
-                $vars{idletime} |= BarnOwl::getidletime();
-                unless (exists $vars{keepAliveTimer}) {
-                    $vars{keepAliveTimer} = BarnOwl::Timer->new({
-                        'after' => 5,
-                        'interval' => 5,
-                        'cb' => sub { BarnOwl::Module::Jabber::do_keep_alive_and_auto_away(@_) }
-                                                                });
-                }
+                $client->onConnect($conn, $jidStr);
             }
         }