Changeset 60986b2 for perl/modules/jabber.pl

Timestamp:

Jan 11, 2007, 4:02:37 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:

004caa5

Parents:

12e5f17

git-author:

Nelson Elhage <nelhage@mit.edu> (01/11/07 15:59:46)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/11/07 16:02:37)

Message:

owl_jabber:: -> BarnOwl::Jabber::

File:

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

perl/modules/jabber.pl

@@ -1 +1 @@
 # -*- mode: cperl; cperl-indent-level: 4; indent-tabs-mode: nil -*-
-package owl_jabber;
+package BarnOwl::Jabber;
 use warnings;
 use strict;
@@ -22 +22 @@
 # Implementing formatting and logging callbacks for C
 # Appropriate callbacks for presence subscription messages.
-#  * Current behavior is auto-accept (default for Net::Jabber)
 #
 ################################################################################
@@ -29 +28 @@
 ################################################################################
 ################################################################################
-package owl_jabber::ConnectionManager;
+package BarnOwl::Jabber::ConnectionManager;
 sub new {
     my $class = shift;
@@ -123 +122 @@
 package owl_jabber;
 
-our $conn = new owl_jabber::ConnectionManager unless $conn;;
+our $conn = new BarnOwl::Jabber::ConnectionManager unless $conn;;
 our %vars;
 
@@ -129 +128 @@
     if ( *BarnOwl::queue_message{CODE} ) {
         register_owl_commands();
-        push @::onMainLoop,     sub { owl_jabber::onMainLoop(@_) };
-        push @::onGetBuddyList, sub { owl_jabber::onGetBuddyList(@_) };
+        push @::onMainLoop,     sub { BarnOwl::Jabber::onMainLoop(@_) };
+        push @::onGetBuddyList, sub { BarnOwl::Jabber::onGetBuddyList(@_) };
     } else {
         # Our owl doesn't support queue_message. Unfortunately, this
@@ -138 +137 @@
 }
 
-push @::onStartSubs, sub { owl_jabber::onStart(@_) };
+push @::onStartSubs, sub { BarnOwl::Jabber::onStart(@_) };
 
 sub onMainLoop {
@@ -329 +328 @@
         #XXX Todo: Add more callbacks.
         # * MUC presence handlers
+        # We use the anonymous subrefs in order to have the correct behavior
+        # when we reload
         $client->SetMessageCallBacks(
-            chat      => sub { owl_jabber::process_incoming_chat_message(@_) },
-            error     => sub { owl_jabber::process_incoming_error_message(@_) },
-            groupchat => sub { owl_jabber::process_incoming_groupchat_message(@_) },
-            headline  => sub { owl_jabber::process_incoming_headline_message(@_) },
-            normal    => sub { owl_jabber::process_incoming_normal_message(@_) }
+            chat      => sub { BarnOwl::Jabber::process_incoming_chat_message(@_) },
+            error     => sub { BarnOwl::Jabber::process_incoming_error_message(@_) },
+            groupchat => sub { BarnOwl::Jabber::process_incoming_groupchat_message(@_) },
+            headline  => sub { BarnOwl::Jabber::process_incoming_headline_message(@_) },
+            normal    => sub { BarnOwl::Jabber::process_incoming_normal_message(@_) }
         );
         $client->SetPresenceCallBacks(
-#            available    => sub { owl_jabber::process_presence_available(@_) },
-#            unavailable  => sub { owl_jabber::process_presence_available(@_) },
-            subscribe    => sub { owl_jabber::process_presence_subscribe(@_) },
-            subscribed   => sub { owl_jabber::process_presence_subscribed(@_) },
-            unsubscribe  => sub { owl_jabber::process_presence_unsubscribe(@_) },
-            unsubscribed => sub { owl_jabber::process_presence_unsubscribed(@_) },
-            error        => sub { owl_jabber::process_presence_error(@_) });
+            available    => sub { BarnOwl::Jabber::process_presence_available(@_) },
+#            unavailable  => sub { BarnOwl::Jabber::process_presence_available(@_) },
+            subscribe    => sub { BarnOwl::Jabber::process_presence_subscribe(@_) },
+            subscribed   => sub { BarnOwl::Jabber::process_presence_subscribed(@_) },
+            unsubscribe  => sub { BarnOwl::Jabber::process_presence_unsubscribe(@_) },
+            unsubscribed => sub { BarnOwl::Jabber::process_presence_unsubscribed(@_) },
+            error        => sub { BarnOwl::Jabber::process_presence_error(@_) });
 
         my $status = $client->Connect( %{ $vars{jlogin_connhash} } );
@@ -544 +545 @@
 
     $muc = shift @ARGV
-      or die("Usage: jmuc join {muc} [-p password] [-a account]");
+      or die("Usage: jmuc join MUC [-p password] [-a account]");
 
     my $presence = new Net::Jabber::Presence;
@@ -561 +562 @@
 
     $muc = shift @args if scalar @args;
-    die("Usage: jmuc part {muc} [-a account]") unless $muc;
+    die("Usage: jmuc part MUC [-a account]") unless $muc;
 
     $conn->getConnectionFromJidStr($jid)->PresenceSend( to => $muc, type => 'unavailable' );
@@ -573 +574 @@
     $muc = shift @args if scalar @args;
 
-    die('Usage: jmuc invite {jid} [muc] [-a account]')
+    die('Usage: jmuc invite JID [muc] [-a account]')
       unless $muc && $invite_jid;