Changeset ee310eb for perl/modules/Jabber

Timestamp:

Feb 3, 2008, 1:08:11 AM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@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:

99219ed

Parents:

625802a (diff), af1920fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged revisions 909-923 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r910 | nelhage | 2008-01-29 20:47:41 -0500 (Tue, 29 Jan 2008) | 1 line
  
  Fix IRC -- I forgot to add one ->conn in the last patch
........
  r911 | asedeno | 2008-01-30 15:49:35 -0500 (Wed, 30 Jan 2008) | 5 lines
  
  Jabber Buddy Lists:
  * Query the jabber:show_offline_buddies once when invoking onGetBuddyList()
  * Don't bold online roster entries when hiding offline ones
........
  r922 | asedeno | 2008-02-03 00:49:46 -0500 (Sun, 03 Feb 2008) | 1 line
  
  Bounds checking.
........
  r923 | asedeno | 2008-02-03 01:01:07 -0500 (Sun, 03 Feb 2008) | 1 line
  
  Portability - removing C++ style comments.
........

Location:

perl/modules/Jabber/lib

Files:

• BarnOwl/Module/Jabber.pm (modified) (3 diffs)
• BarnOwl/Module/Jabber/Connection.pm (modified) (1 diff)
• Net/XMPP/Debug.pm (modified) (1 diff)
• Net/XMPP/Message.pm (modified) (1 diff)
• XML/Stream.pm (modified) (1 diff)

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

@@ -137 +137 @@
 }
 
+our $showOffline = 0;
+
 sub blist_listBuddy {
     my $roster = shift;
@@ -152 +154 @@
         $blistStr .= " [" . ( $rq{show} ? $rq{show} : 'online' ) . "]";
         $blistStr .= " " . $rq{status} if $rq{status};
-        $blistStr = BarnOwl::Style::boldify($blistStr);
+        $blistStr = BarnOwl::Style::boldify($blistStr) if $showOffline;
     }
     else {
-        return '' if (BarnOwl::getvar('jabber:show_offline_buddies') eq 'off');
+        return '' unless $showOffline;
         if ($jq{ask}) {
             $blistStr .= " [pending]";
@@ -198 +200 @@
 
 sub onGetBuddyList {
+    $showOffline = BarnOwl::getvar('jabber:show_offline_buddies') eq 'on';
     my $blist = "";
     foreach my $jid ($conn->getJIDs()) {

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

@@ -1 +1 @@
 use warnings;
 use strict;
+use utf8;
 
 =head1 NAME

perl/modules/Jabber/lib/Net/XMPP/Debug.pm

@@ -189 +189 @@
                         {
                             $self->{HANDLE}->autoflush(1);
+                            binmode $self->{HANDLE}, ":utf8";
                             $Net::XMPP::Debug::HANDLES{$args{file}} = $self->{HANDLE};
                         }

perl/modules/Jabber/lib/Net/XMPP/Message.pm

@@ -135 +135 @@
                             $Mess->SetMessage(TO=>"bob\@jabber.org",
                                               Subject=>"Lunch",
-                                              BoDy=>"Let's do lunch!");
+                                              Body=>"Let's do lunch!");
                             $Mess->SetMessage(to=>"bob\@jabber.org",
                                               from=>"jabber.org",

perl/modules/Jabber/lib/XML/Stream.pm

@@ -1659 +1659 @@
     {
         $self->debug(3,"Send: can_write");
-        
+
         $self->{SENDSTRING} = Encode::encode_utf8(join("",@_));