[366] in BarnOwl Developers
[D-O-H] r508 - trunk/owl/perl/modules
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:05:23 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: Tue, 9 Jan 2007 15:46:33 -0500 (EST)
Author: asedeno
Date: 2007-01-09 15:46:33 -0500 (Tue, 09 Jan 2007)
New Revision: 508
Modified:
trunk/owl/perl/modules/jabber.pl
Log:
Google Talk wasn't giving us back results. This takes that behavior as
a 401 and asks the user for a password if one hasn't been supplied
yet.
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-09 20:24:04 UTC (rev 507)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-09 20:46:33 UTC (rev 508)
@@ -54,11 +54,11 @@
my $self = shift;
my $jidStr = shift;
return 0 unless exists $self->{Client}->{$jidStr};
-
+
$self->{Client}->{$jidStr}->Disconnect();
delete $self->{Roster}->{$jidStr};
delete $self->{Client}->{$jidStr};
-
+
return 1;
}
@@ -349,8 +349,8 @@
} else {
my @result = $client->AuthSend( %{ $vars{jlogin_authhash} } );
- if ( $result[0] ne 'ok' ) {
- if ( !$vars{jlogin_havepass} && $result[0] eq '401' ) {
+ if ( $#result == -1 || $result[0] ne 'ok' ) {
+ if ( !$vars{jlogin_havepass} && ( $#result == -1 || $result[0] eq '401' ) ) {
$vars{jlogin_havepass} = 1;
$conn->removeConnection($jidStr);
owl::start_password( "Password for $jidStr: ", \&do_login );
