Changeset 9667006 for perl/modules/jabber.pl

Timestamp:

Jan 8, 2007, 4:17:31 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:

5f576e3

Parents:

6475057

git-author:

Nelson Elhage <nelhage@mit.edu> (01/08/07 14:34:12)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/08/07 16:17:31)

Message:

First pass at printing presence errors. This works with
conference.mit.edu, but only prints the error code for
conference.jabber.org right now.

File:

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

perl/modules/jabber.pl

@@ -131 +131 @@
         push @::onMainLoop,     sub { owl_jabber::onMainLoop(@_) };
         push @::onGetBuddyList, sub { owl_jabber::onGetBuddyList(@_) };
-    }
-    else {
+    } else {
         # Our owl doesn't support queue_message. Unfortunately, this
         # means it probably *also* doesn't support owl::error. So just
@@ -341 +340 @@
             subscribed   => sub { owl_jabber::process_presence_subscribed(@_) },
             unsubscribe  => sub { owl_jabber::process_presence_unsubscribe(@_) },
-            unsubscribed => sub { owl_jabber::process_presence_unsubscribed(@_) });
+            unsubscribed => sub { owl_jabber::process_presence_unsubscribed(@_) },
+            error        => sub { owl_jabber::process_presence_error(@_) });
 
         my $status = $client->Connect( %{ $vars{jlogin_connhash} } );
@@ -975 +975 @@
 }
 
+sub process_presence_error {
+    my ( $sid, $p ) = @_;
+    my $code = $p->GetErrorCode();
+    my $error = $p->GetError();
+    owl::error("Jabber: $code $error");
+}
+
 
 ### Helper functions
@@ -1070 +1077 @@
     return '@b[' . $str . ']' if ( $str !~ /\]/ );
 
-    my $txt = "\@b($str";
-    $txt =~ s/\)/\)\@b\[\)\]\@b\(/g;
-    return $txt . ')';
+    my $txt = "$str";
+    $txt =~ s{[)]}{)\@b[)]\@b(}g;
+    return '@b(' . $txt . ')';
 }