Changeset e1e59a7 for perl

Timestamp:

Oct 10, 2009, 9:24:18 PM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

69c3878

Parents:

737b8f1 (diff), 1fdca1b (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 branch 'unicode-fixes'

Location:

perl

Files:

• modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)
• lib/BarnOwl.pm (modified) (1 diff)
• modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)

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

@@ -399 +399 @@
     $body =~ tr/\n\r/  /;
     if ($body =~ /^\/me (.*)/) {
-        $conn->conn->me($to, $1);
+        $conn->conn->me($to, Encode::encode('utf-8', $1));
         $body = '* '.$conn->nick.' '.$1;
     } else {
-        $conn->conn->privmsg($to, $body);
+        $conn->conn->privmsg($to, Encode::encode('utf-8', $body));
     }
     my $msg = BarnOwl::Message->new(

perl/lib/BarnOwl.pm

@@ -435 +435 @@
 sub default_zephyr_signature
 {
-  if (my $zsig = getvar('zsig')) {
-    return $zsig;
+  my $zsig = getvar('zsig');
+  if (!$zsig && (my $zsigproc = getvar('zsigproc'))) {
+    $zsig = `$zsigproc`;
+  } elsif (!defined($zsig = get_zephyr_variable('zwrite-signature'))) {
+    $zsig = ((getpwuid($<))[6]);
+    $zsig =~ s/,.*//;
   }
-  if (my $zsigproc = getvar('zsigproc')) {
-    return `$zsigproc`;
-  }
-  my $zwrite_signature = get_zephyr_variable('zwrite-signature');
-  if (defined($zwrite_signature)) {
-    return $zwrite_signature;
-  }
-  my $name = ((getpwuid($<))[6]);
-  $name =~ s/,.*//;
-  return $name;
+  chomp($zsig);
+  return $zsig;
 }
 

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

@@ -321 +321 @@
               . "add <jid>     Adds <jid> to your roster.\n\n"
               . "unsub <jid>   Unsubscribe from <jid>'s presence.\n\n"
-              . "remove <jid>  Removes <jid> to your roster. (implicit unsub)\n\n"
+              . "remove <jid>  Removes <jid> from your roster. (implicit unsub)\n\n"
               . "auth <jid>    Authorizes <jid> to subscribe to your presence.\n\n"
               . "deauth <jid>  De-authorizes <jid>'s subscription to your presence.\n\n"