Changeset 8574801

Timestamp:

Jan 16, 2008, 2:34:55 PM (17 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:

3cc1582

Parents:

b7b4565

Message:

Patches to jabber libraries for better UTF-8 handling.

Location:

perl/modules/Jabber/lib

Files:

• Net/XMPP/Debug.pm (modified) (1 diff)
• Net/XMPP/Message.pm (modified) (1 diff)
• XML/Stream.pm (modified) (1 diff)

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

@@ -186 +186 @@
                     {
                         $self->{HANDLE} = new FileHandle(">$args{file}");
+                        binmode $self->{HANDLE}, ":utf8";
                         if (defined($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("",@_));
+
+        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;