Changes in perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm [879e7e94:6b580b0]

File:

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

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

@@ -116 +116 @@
             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) ) {
@@ -124 +124 @@
         if ($::shutdown) {
             do_logout($jid);
-            return;
-        }
+            next;
+        }
+
         if ($vars{status_changed}) {
             my $p = new Net::Jabber::Presence;
@@ -387 +388 @@
                 $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() });
             }
         }