Changes in perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm [b73ce70:e979da9]

File:

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

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

@@ -70 +70 @@
         $BarnOwl::Hooks::mainLoop->add("BarnOwl::Module::Jabber::onMainLoop");
         $BarnOwl::Hooks::getBuddyList->add("BarnOwl::Module::Jabber::onGetBuddyList");
-        $BarnOwl::Hooks::getQuickstart->add("BarnOwl::Module::Jabber::onGetQuickstart");
         $vars{show} = '';
         BarnOwl::new_variable_bool("jabber:show_offline_buddies",
@@ -223 +222 @@
 }
 
-sub onGetQuickstart {
-    return <<'EOF'
-@b(Jabber:)
-Type ':jabberlogin @b(username@mit.edu)' to log in to Jabber. The command
-':jroster sub @b(somebody@gmail.com)' will request that they let you message
-them. Once you get a message saying you are subscribed, you can message
-them by typing ':jwrite @b(somebody@gmail.com)' or just 'j @b(somebody)'.
-EOF
-}
-
 ################################################################################
 ### Owl Commands
@@ -446 +435 @@
 
 sub cmd_logout {
-    return "You are not logged into jabber." unless ($conn->connected() > 0);
     # Logged into multiple accounts
     if ( $conn->connected() > 1 ) {
@@ -1124 +1112 @@
 sub process_presence_subscribed {
     my ( $sid, $p ) = @_;
-    queue_admin_msg("ignoring:".$p->GetXML()) if BarnOwl::getvar('jabber:spew') eq 'on';
+    queue_admin_msg("ignoring:".$p->GetXML());
     # RFC 3921 says we should respond to this with a "subscribe"
     # but this causes a flood of sub/sub'd presence packets with
@@ -1134 +1122 @@
 sub process_presence_unsubscribed {
     my ( $sid, $p ) = @_;
-    queue_admin_msg("ignoring:".$p->GetXML()) if BarnOwl::getvar('jabber:spew') eq 'on';
+    queue_admin_msg("ignoring:".$p->GetXML());
     # RFC 3921 says we should respond to this with a "subscribe"
     # but this causes a flood of unsub/unsub'd presence packets with