Changeset 005562f

Timestamp:

Nov 10, 2006, 3:47:57 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:

3405394

Parents:

d9f4a5c

git-author:

Nelson Elhage <nelhage@mit.edu> (11/10/06 15:47:50)

git-committer:

Nelson Elhage <nelhage@mit.edu> (11/10/06 15:47:57)

Message:

Making reply-sender work right in chats

File:

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

perl/modules/jabber.pl

@@ -393 +393 @@
 
     owl::message(
-"Type your message below.  End with a dot on a line by itself.  ^C will quit."
-    );
+        "Type your message below.  End with a dot on a line by itself.  ^C will quit."
+       );
     owl::start_edit_win( join( ' ', @args ), \&process_owl_jwrite );
 }
@@ -541 +541 @@
     $connections->{ $vars{jwrite}{from} }->{client}->Send($j);
     delete $vars{jwrite};
+    owl::message("");   # Kludge to make the ``type your message...'' message go away
 }
 
@@ -612 +613 @@
     $props{to}   = $to->GetJID('full');
 
+    my $account = ( $dir eq 'out' ) ? $props{from} : $props{to};
+
     $props{recipient}  = $to->GetJID('base');
     $props{sender}     = $from->GetJID('base');
@@ -623 +626 @@
     if ( $jtype eq 'chat' ) {
         $props{replycmd} =
-          "jwrite " . ( ( $dir eq 'in' ) ? $props{from} : $props{to} );
-        $props{replycmd} .=
-          " -a " . ( ( $dir eq 'out' ) ? $props{from} : $props{to} );
+          "jwrite " . ( ( $dir eq 'in' ) ? $props{from} : $props{to} ) . " -a $account";
         $props{isprivate} = 1;
+        $props{replysendercmd} = $props{replycmd};
     }
     elsif ( $jtype eq 'groupchat' ) {
         my $nick = $props{nick} = $from->GetResource();
         my $room = $props{room} = $from->GetJID('base');
-        $props{replycmd} = "jwrite -g $room";
-        $props{replycmd} .=
-          " -a " . ( ( $dir eq 'out' ) ? $props{from} : $props{to} );
+        $props{replycmd} = "jwrite -g $room -a $account";
+
+        $props{replysendercmd} = "jwrite " . $from->GetJID('full') . " -a $account";
 
         $props{sender} = $nick || $room;
@@ -659 +661 @@
     }
 
-    $props{replysendercmd} = $props{replycmd};
     return %props;
 }