Changeset aed6bcd


Ignore:
Timestamp:
May 30, 2008, 3:14:50 PM (13 years ago)
Author:
Sam Hartman <hartmans@mit.edu>
Branches:
debian
Children:
c780a08
Parents:
10e0ab8 (diff), d7a3188 (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:
Merge commit 'upstream/1.0.1'
Files:
13 added
1 deleted
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r6af4068 rd7a3188  
    11$Id$
     2
     31.0.1
     4 * Remove an unneeded .orig file from libfaim/ - hartmans
     5 * Update the copyright notice in ':show license' - nelhage
     6 * Add a jabber:spew variable that controls whether unrecognized
     7   Jabber messages (such as pubsub requests) are displayed. - nelhage
     8 * Make the 'style' command assume the main:: package for
     9   unqualified subroutine references. Reported by Jesse Vincent. - nelhage
     10 * Rename doc/contributors to the more canonical AUTHORS - nelson
    211
    3121.0.0
  • functions.c

    r6a990fb r4367915  
    125125  text=""
    126126    "barnowl version " OWL_VERSION_STRING "\n"
     127    "Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.\n"
    127128    "Copyright (c) 2004 James Kretchmar. All rights reserved.\n"
    128129    "\n"
  • owl.h

    r2401376 rd7a3188  
    5656
    5757#ifndef OWL_VERSION_STRING
    58 #define OWL_VERSION_STRING "1.0.0"
     58#define OWL_VERSION_STRING "1.0.1"
    5959#endif
    6060
  • perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

    rdb0ac7e r8af89a7  
    7474                                   { default => 1,
    7575                                     summary => 'Show offline or pending buddies.'});
     76        BarnOwl::new_variable_bool("jabber:spew",
     77                                   { default => 0,
     78                                     summary => 'Display unrecognized Jabber messages.'});
    7679        BarnOwl::new_variable_int("jabber:auto_away_timeout",
    7780                                  { default => 5,
     
    974977    #    }
    975978    #
    976     BarnOwl::queue_message( BarnOwl::Message->new(%jhash) );
     979    if(BarnOwl::getvar('jabber:spew') eq 'on') {
     980        BarnOwl::queue_message( BarnOwl::Message->new(%jhash) );
     981    }
    977982}
    978983
  • perlwrap.pm

    r6b3878b rb441079  
    10231023    my $fn   = shift;
    10241024    {
     1025        # For historical reasons, assume unqualified references are
     1026        # in main::
     1027        package main;
    10251028        no strict 'refs';
    10261029        unless(*{$fn}{CODE}) {
     
    10551058        $_[0]->legacy_populate_global();
    10561059    }
    1057     no strict 'refs';
    1058     goto \&{$self->{function}};
     1060    {
     1061      package main;
     1062      no strict 'refs';
     1063      goto \&{$self->{function}};
     1064    }
    10591065}
    10601066
  • Makefile.in

    r84d48cc r8363d50  
    3232
    3333EXE = barnowl
    34 PERL_MODULES = Jabber
     34PERL_MODULES = Jabber IRC
    3535MODULE_DIRS = $(PERL_MODULES:%=perl/modules/%)
    3636
Note: See TracChangeset for help on using the changeset viewer.