[423] in BarnOwl Developers
[D-O-H] r554 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:06:00 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Tue, 23 Jan 2007 18:36:27 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-01-23 18:36:27 -0500 (Tue, 23 Jan 2007)
New Revision: 554
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r18170@phanatique: nelhage | 2007-01-23 18:34:46 -0500
Some bugfixing to JID guessing.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18169
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18170
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-23 23:36:24 UTC (rev 553)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-23 23:36:27 UTC (rev 554)
@@ -581,10 +581,14 @@
}
($jwrite_from, $jwrite_to, $jwrite_type) = guess_jwrite($jwrite_from, $to);
-
- unless($jwrite_from && $jwrite_to) {
+
+ unless($jwrite_to) {
die("Unable to resolve JID $to");
}
+
+ unless($jwrite_from) {
+ die("Unable to resolve account");
+ }
$vars{jwrite} = {
to => $jwrite_to,
@@ -1288,10 +1292,8 @@
sub resolveDestJID {
my ($to, $from) = @_;
+ return $to if $to =~ /@/;
my $jid = Net::Jabber::JID->new($to);
- if($jid->GetResource()) {
- return $jid->GetJID('full');
- }
my $roster = $conn->getRosterFromJID($from);
my @jids = $roster->jids('all');
@@ -1326,7 +1328,7 @@
} elsif($to =~ /@/) {
$to_jid = $to;
$from_jid = defaultJID();
- die("You must specify a JID with -a") unless $from_jid;
+ die("You must specify an account with -a") unless $from_jid;
} else {
for my $f ($conn->getJids) {
$to_jid = resolveDestJID($to, $f);
