[901] in BarnOwl Developers
[D-O-H] r887 - in branches/barnowl_unicode/owl: . perl/modules/Jabber/lib/BarnOwl/Module
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:10:56 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 21:54:56 -0500 (EST)
Author: asedeno
Date: 2008-01-16 21:54:55 -0500 (Wed, 16 Jan 2008)
New Revision: 887
Modified:
branches/barnowl_unicode/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
branches/barnowl_unicode/owl/perlconfig.c
Log:
unicode/glib branch
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.
Modified: branches/barnowl_unicode/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
===================================================================
--- branches/barnowl_unicode/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-01-17 01:18:25 UTC (rev 886)
+++ branches/barnowl_unicode/owl/perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm 2008-01-17 02:54:55 UTC (rev 887)
@@ -295,9 +295,9 @@
sub cmd_login {
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();
my $componentname = $jid->GetServer();
@@ -478,7 +478,7 @@
return;
}
else {
- $to = check_utf8(shift @ARGV);
+ $to = shift @ARGV;
}
my @candidates = guess_jwrite($from, $to);
@@ -522,7 +522,6 @@
my $cmd = "jwrite $jwrite_to -a $jwrite_from";
$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 );
}
@@ -1082,14 +1081,6 @@
### 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;
my %initProps = %{ shift() };
@@ -1224,7 +1215,7 @@
}
sub resolveConnectedJID {
- my $givenJIDStr = check_utf8(shift);
+ my $givenJIDStr = shift;
my $givenJID = new Net::Jabber::JID;
$givenJID->SetJID($givenJIDStr);
Modified: branches/barnowl_unicode/owl/perlconfig.c
===================================================================
--- branches/barnowl_unicode/owl/perlconfig.c 2008-01-17 01:18:25 UTC (rev 886)
+++ branches/barnowl_unicode/owl/perlconfig.c 2008-01-17 02:54:55 UTC (rev 887)
@@ -453,7 +453,9 @@
PUSHMARK(SP);
for(i=0;i<argc;i++) {
- XPUSHs(sv_2mortal(newSVpv(argv[i], 0)));
+ SV *tmp = newSVpv(argv[i], 0);
+ SvUTF8_on(tmp);
+ XPUSHs(sv_2mortal(tmp));
}
PUTBACK;
@@ -487,18 +489,21 @@
void owl_perlconfig_edit_callback(owl_editwin *e)
{
SV *cb = (SV*)(e->cbdata);
+ SV *text;
unsigned int n_a;
dSP;
if(cb == NULL) {
owl_function_error("Perl callback is NULL!");
}
+ text = newSVpv(owl_editwin_get_text(e), 0);
+ SvUTF8_on(text);
ENTER;
SAVETMPS;
PUSHMARK(SP);
- XPUSHs(sv_2mortal(newSVpv(owl_editwin_get_text(e), 0)));
+ XPUSHs(sv_2mortal(text));
PUTBACK;
call_sv(cb, G_DISCARD|G_KEEPERR|G_EVAL);
