Ignore:
Timestamp:
Feb 3, 2008, 1:08:11 AM (16 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/BarnOwl/Module
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r81312e4 ree310eb  
    137137}
    138138
     139our $showOffline = 0;
     140
    139141sub blist_listBuddy {
    140142    my $roster = shift;
    … …  
    152154        $blistStr .= " [" . ( $rq{show} ? $rq{show} : 'online' ) . "]";
    153155        $blistStr .= " " . $rq{status} if $rq{status};
    154         $blistStr = BarnOwl::Style::boldify($blistStr);
     156        $blistStr = BarnOwl::Style::boldify($blistStr) if $showOffline;
    155157    }
    156158    else {
    157         return '' if (BarnOwl::getvar('jabber:show_offline_buddies') eq 'off');
     159        return '' unless $showOffline;
    158160        if ($jq{ask}) {
    159161            $blistStr .= " [pending]";
    … …  
    198200
    199201sub onGetBuddyList {
     202    $showOffline = BarnOwl::getvar('jabber:show_offline_buddies') eq 'on';
    200203    my $blist = "";
    201204    foreach my $jid ($conn->getJIDs()) {

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

    r892568b re0ffe77  
    11use warnings;
    22use strict;
     3use utf8;
    34
    45=head1 NAME
Note: See TracChangeset for help on using the changeset viewer.