Changeset 6119fbb for perl/modules

Timestamp:

Feb 28, 2008, 7:29:03 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

2d4ff14

Parents:

f8d9df1 (diff), 3bf5516 (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 972-974 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r973 | nelhage | 2008-02-28 18:18:54 -0500 (Thu, 28 Feb 2008) | 2 lines
  
  Make IRC admin messages actually display their content
........
  r974 | asedeno | 2008-02-28 19:27:35 -0500 (Thu, 28 Feb 2008) | 1 line
  
  Fix a file descriptor leak.
........

Location:

perl/modules

Files:

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

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

@@ -126 +126 @@
             BarnOwl::Style::boldify('IRC ' . $evt->type . ' message from '
                 . $self->alias) . "\n"
-            . strip_irc_formatting(join '\n', cdr($evt->args)));
+            . strip_irc_formatting(join '\n', $evt->args));
 }
 

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

@@ -214 +214 @@
     $self->{DISCONNECTED} = 1;
     $self->{DEBUG}->Log1("Disconnect: bye bye");
+    $self->{DEBUG}->GetHandle()->close();
 }
 

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

@@ -25 +25 @@
 use Net::DNS;
 use Getopt::Long;
+
+use utf8;
 
 our $VERSION = 0.1;
@@ -377 +379 @@
                     $vars{jlogin_havepass} = 1;
                     $conn->removeConnection($jidStr);
-                    BarnOwl::start_password( "Password for $jidStr: ", \&do_login );
+                    BarnOwl::start_password("Password for $jidStr: ", \&do_login );
                     return "";
                 }
@@ -486 +488 @@
     }
     else {
-        $to = shift @ARGV;
+      $to = shift @ARGV;
     }
 
@@ -530 +532 @@
     $cmd .= " -t $jwrite_thread" if $jwrite_thread;
     $cmd .= " -s $jwrite_subject" if $jwrite_subject;
-    BarnOwl::start_edit_win( $cmd, \&process_owl_jwrite );
+
+    BarnOwl::start_edit_win($cmd, \&process_owl_jwrite );
 }
 

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("",@_));