Changeset 2d423e9

Timestamp:

Jan 22, 2007, 7:00:17 PM (18 years ago)

Author:

Nelson Elhage <nelhage@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:

eaf9ed0

Parents:

6837096

git-author:

Nelson Elhage <nelhage@mit.edu> (01/22/07 19:00:11)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/22/07 19:00:17)

Message:

Don't die horribly if a connection becomed undefined (often due to a
failed reload)

File:

• perl/modules/jabber.pl (modified) (4 diffs)

perl/modules/jabber.pl

@@ -248 +248 @@
         my $client = $conn->getConnectionFromJidStr($jid);
 
+        unless($client) {
+            $conn->removeConnection($jid);
+            BarnOwl::error("Connection for $jid undefined -- error in reload?");
+        }
+        
         my $status = $client->Process(0);
         if ( !defined($status) ) {
@@ -273 +278 @@
     my $res = $roster->resource($buddy);
 
-    $blistStr .= $jq{name} ? $jq{name} . "\t(" .$buddy->GetJID() . ')' : $buddy->GetJID();
+    my $name = $jq{name} || $buddy->GetUserID();
+
+    $blistStr .= sprintf '%-15s %s', $name, $buddy->GetJID();
 
     if ($res) {
@@ -306 +313 @@
         foreach my $group ( $roster->groups() ) {
             $blist .= "  Group: $group\n";
-            foreach my $buddy ( $roster->jids( 'group', $group ) ) {
+            my @buddies = $roster->jids( 'group', $group );
+            foreach my $buddy ( @buddies ) {
                 $blist .= blist_listBuddy( $roster, $buddy );
             }
@@ -742 +750 @@
         deauth   => \&jroster_deauth
     );
-
     my $func = $jroster_commands{$cmd};
     if ( !$func ) {