Changeset 367fbf3 for perl/modules/Jabber/lib

Timestamp:

Jan 16, 2008, 9:54: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:

a8d5a39

Parents:

e0ffe77

Message:

Remove a debug message I accidentally left in.
Remove the hours old check_utf8 hackery in favor of actually
marking strings as UTF-8 from the C side.

File:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (5 diffs)

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

@@ -296 +296 @@
     my $cmd = shift;
     my $jid = new Net::Jabber::JID;
-    $jid->SetJID(check_utf8(shift));
+    $jid->SetJID(shift);
     my $password = '';
-    $password = check_utf8(shift) if @_;
+    $password = shift if @_;
 
     my $uid           = $jid->GetUserID();
@@ -479 +479 @@
     }
     else {
-      $to = check_utf8(shift @ARGV);
+      $to = shift @ARGV;
     }
 
@@ -523 +523 @@
     $cmd .= " -t $jwrite_thread" if $jwrite_thread;
     $cmd .= " -s $jwrite_subject" if $jwrite_subject;
-    queue_admin_msg("$cmd - utf8: ".Encode::is_utf8($cmd));
 
     BarnOwl::start_edit_win( Encode::encode_utf8($cmd), \&process_owl_jwrite );
@@ -1083 +1082 @@
 ### Helper functions
 
-sub check_utf8
-{
-  my $str = shift;
-  Encode::_utf8_on($str);
-  Encode::_utf8_off($str) unless (Encode::is_utf8($str, 1));
-  return $str;
-}
-
 sub j2hash {
     my $j   = shift;
@@ -1225 +1216 @@
 
 sub resolveConnectedJID {
-    my $givenJIDStr = check_utf8(shift);
+    my $givenJIDStr = shift;
     my $givenJID    = new Net::Jabber::JID;
     $givenJID->SetJID($givenJIDStr);