[896] in BarnOwl Developers
[D-O-H] r883 - in branches/barnowl_unicode/owl/perl/modules/Jabber/lib: Net/XMPP XML
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:10:54 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Wed, 16 Jan 2008 14:34:56 -0500 (EST)
Author: asedeno
Date: 2008-01-16 14:34:55 -0500 (Wed, 16 Jan 2008)
New Revision: 883
Modified:
branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Debug.pm
branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Message.pm
branches/barnowl_unicode/owl/perl/modules/Jabber/lib/XML/Stream.pm
Log:
Unicode/glib branch
Patches to jabber libraries for better UTF-8 handling.
Modified: branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Debug.pm
===================================================================
--- branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Debug.pm 2008-01-16 18:46:37 UTC (rev 882)
+++ branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Debug.pm 2008-01-16 19:34:55 UTC (rev 883)
@@ -185,6 +185,7 @@
if (-w $args{file})
{
$self->{HANDLE} = new FileHandle(">$args{file}");
+ binmode $self->{HANDLE}, ":utf8";
if (defined($self->{HANDLE}))
{
$self->{HANDLE}->autoflush(1);
Modified: branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Message.pm
===================================================================
--- branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Message.pm 2008-01-16 18:46:37 UTC (rev 882)
+++ branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Message.pm 2008-01-16 19:34:55 UTC (rev 883)
@@ -134,7 +134,7 @@
$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",
errorcode=>404,
Modified: branches/barnowl_unicode/owl/perl/modules/Jabber/lib/XML/Stream.pm
===================================================================
--- branches/barnowl_unicode/owl/perl/modules/Jabber/lib/XML/Stream.pm 2008-01-16 18:46:37 UTC (rev 882)
+++ branches/barnowl_unicode/owl/perl/modules/Jabber/lib/XML/Stream.pm 2008-01-16 19:34:55 UTC (rev 883)
@@ -1658,9 +1658,14 @@
if ($self->{SIDS}->{$sid}->{select}->can_write(0))
{
$self->debug(3,"Send: can_write");
-
- $self->{SENDSTRING} = Encode::encode_utf8(join("",@_));
+ my $sendstring = join("",@_);
+
+ Encode::_utf8_on($sendstring);
+ Encode::_utf8_off($sendstring) unless (Encode::is_utf8($sendstring, 1));
+
+ $self->{SENDSTRING} = Encode::encode_utf8($sendstring);
+
$self->{SENDWRITTEN} = 0;
$self->{SENDOFFSET} = 0;
$self->{SENDLENGTH} = length($self->{SENDSTRING});
