Changeset bc8275e for perl

Timestamp:

Jun 2, 2009, 6:36:17 PM (15 years ago)

Author:

Alex Dehnert <adehnert@mit.edu>

Branches:

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

Children:

fc92548d

Parents:

8daf504

Message:

Fix replycmd to use right class/instance

Replies to personals, login messages, etc.
should not use the message's class. Fixes
bug introduced by 62236380ee077b92.

File:

• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (3 diffs)

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -81 +81 @@
 # Portion of the reply command that preserves the context
 sub context_reply_cmd {
-    my $m = shift;
+    my $mclass = shift;
+    my $minstance = shift;
     my $class = "";
-    if (lc($m->class) ne "message") {
-        $class = "-c " . BarnOwl::quote($m->class);
+    if (lc($mclass) ne "message") {
+        $class = "-c " . BarnOwl::quote($mclass);
     }
     my $instance = "";
-    if (lc($m->instance) ne "personal") {
-        $instance = "-i " . BarnOwl::quote($m->instance);
+    if (lc($minstance) ne "personal") {
+        $instance = "-i " . BarnOwl::quote($minstance);
     }
     if (($class eq "") or  ($instance eq "")) {
@@ -99 +100 @@
 sub personal_context {
     my ($m) = @_;
-    return $m->context_reply_cmd();
+    return context_reply_cmd($m->class, $m->instance);
 }
 
@@ -184 +185 @@
     }
 
-    my $context_part = $self->context_reply_cmd();
+    my $context_part = context_reply_cmd($class, $instance);
     $cmd .= " " . $context_part unless ($context_part eq '');
     if ($to ne '') {