Changeset 5f3168a for perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

Timestamp:

Feb 18, 2008, 9:07:22 PM (17 years ago)

Author:

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

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

b70d24f

Parents:

680ed23 (diff), 9d2f010 (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:

Merged revisions 928-950 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r937 | nelhage | 2008-02-11 23:09:54 -0500 (Mon, 11 Feb 2008) | 2 lines
  
  Bind M-left and M-right by default in the editor
........
  r947 | nelhage | 2008-02-18 16:45:22 -0500 (Mon, 18 Feb 2008) | 2 lines
  
  We need to stick modules on the beginning of @INC, not the end
........
  r949 | asedeno | 2008-02-18 19:43:09 -0500 (Mon, 18 Feb 2008) | 1 line
  
  Merging in the select branch.
........
  r950 | asedeno | 2008-02-18 20:54:45 -0500 (Mon, 18 Feb 2008) | 1 line
  
  Merging in the select branch, part 2. select.c
........

File:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (3 diffs)

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

@@ -118 +118 @@
             BarnOwl::error("Connection for $jid undefined -- error in reload?");
         }
-
+        # We keep this in the mainloop hook for keep-alives
         my $status = $client->Process(0);
         if ( !defined($status) ) {
@@ -126 +126 @@
         if ($::shutdown) {
             do_logout($jid);
-            return;
-        }
+            next;
+        }
+
         if ($vars{status_changed}) {
             my $p = new Net::Jabber::Presence;
@@ -389 +390 @@
                 $conn->renameConnection($jidStr, $fullJid);
                 queue_admin_msg("Connected to jabber as $fullJid");
+                # The remove_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() });
             }
         }