Changeset a1a2036 for perl/modules/Jabber/lib/BarnOwl/Module

Timestamp:

Jul 28, 2008, 9:08:41 AM (17 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

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

Children:

bfc127b

Parents:

4789b17

Message:

THIS IS AN ANGRY COMMIT

File:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (2 diffs)

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

@@ -990 +990 @@
 sub process_presence_available {
     my ( $sid, $p ) = @_;
-    my $from = $p->GetFrom();
+    my $from = $p->GetFrom('jid')->GetJID('base');
     my $to = $p->GetTo();
     my $type = $p->GetType();
     my %props = (
         to => $to,
-        from => $from,
+        from => $p->GetFrom(),
         recipient => $to,
         sender => $from,
@@ -1013 +1013 @@
         $props{loginout} = 'logout';
     }
-    $props{replysendercmd} = $props{replycmd} = "jwrite $from -i $sid";
-    if(BarnOwl::getvar('debug') eq 'on') {
-        BarnOwl::queue_message(BarnOwl::Message->new(%props));
-    }
+    $props{replysendercmd} = $props{replycmd} = "jwrite $from -a $to";
+    BarnOwl::queue_message(BarnOwl::Message->new(%props));
 }