Changeset 0a3f04d

Timestamp:

Jan 23, 2007, 6:36:27 PM (18 years ago)

Author:

Nelson Elhage <nelhage@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:

0ad0e97

Parents:

acee046

git-author:

Nelson Elhage <nelhage@mit.edu> (01/23/07 18:34:46)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/23/07 18:36:27)

Message:

Some bugfixing to JID guessing.

File:

• perl/modules/jabber.pl (modified) (3 diffs)

perl/modules/jabber.pl

@@ -582 +582 @@
 
     ($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");
     }
     
@@ -1289 +1293 @@
 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);
@@ -1327 +1329 @@
         $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) {