Changeset aed6bcd

Timestamp:

May 30, 2008, 3:14:50 PM (16 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:

• AUTHORS (moved) (moved from doc/contributors)
• ChangeLog (modified) (1 diff)
• functions.c (modified) (1 diff)
• libfaim/rxhandlers.c.orig (deleted)
• owl.h (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (2 diffs)
• perlwrap.pm (modified) (2 diffs)
• .gitignore (added)
• Makefile.in (modified) (1 diff)
• debian/README.Debian (added)
• debian/barnowl-irc.install (added)
• debian/barnowl.dirs (added)
• debian/barnowl.docs (added)
• debian/barnowl.install (added)
• debian/changelog (added)
• debian/compat (added)
• debian/control (added)
• debian/control.in (added)
• debian/copyright (added)
• debian/rules (added)
• debian/shlibs.local (added)

ChangeLog

@@ -1 +1 @@
 $Id$
+
+1.0.1
+ * Remove an unneeded .orig file from libfaim/ - hartmans
+ * Update the copyright notice in ':show license' - nelhage
+ * Add a jabber:spew variable that controls whether unrecognized
+   Jabber messages (such as pubsub requests) are displayed. - nelhage
+ * Make the 'style' command assume the main:: package for
+   unqualified subroutine references. Reported by Jesse Vincent. - nelhage
+ * Rename doc/contributors to the more canonical AUTHORS - nelson
 
 1.0.0

functions.c

@@ -125 +125 @@
   text=""
     "barnowl version " OWL_VERSION_STRING "\n"
+    "Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.\n"
     "Copyright (c) 2004 James Kretchmar. All rights reserved.\n"
     "\n"

owl.h

@@ -56 +56 @@
 
 #ifndef OWL_VERSION_STRING
-#define OWL_VERSION_STRING "1.0.0"
+#define OWL_VERSION_STRING "1.0.1"
 #endif
 

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

@@ -74 +74 @@
                                    { default => 1,
                                      summary => 'Show offline or pending buddies.'});
+        BarnOwl::new_variable_bool("jabber:spew",
+                                   { default => 0,
+                                     summary => 'Display unrecognized Jabber messages.'});
         BarnOwl::new_variable_int("jabber:auto_away_timeout",
                                   { default => 5,
@@ -974 +977 @@
     #    }
     #
-    BarnOwl::queue_message( BarnOwl::Message->new(%jhash) );
+    if(BarnOwl::getvar('jabber:spew') eq 'on') {
+        BarnOwl::queue_message( BarnOwl::Message->new(%jhash) );
+    }
 }
 

perlwrap.pm

@@ -1023 +1023 @@
     my $fn   = shift;
     {
+        # For historical reasons, assume unqualified references are
+        # in main::
+        package main;
         no strict 'refs';
         unless(*{$fn}{CODE}) {
@@ -1055 +1058 @@
         $_[0]->legacy_populate_global();
     }
-    no strict 'refs';
-    goto \&{$self->{function}};
+    {
+      package main;
+      no strict 'refs';
+      goto \&{$self->{function}};
+    }
 }
 

Makefile.in

@@ -32 +32 @@
 
 EXE = barnowl
-PERL_MODULES = Jabber
+PERL_MODULES = Jabber IRC
 MODULE_DIRS = $(PERL_MODULES:%=perl/modules/%)