Changeset 6223638

Timestamp:

May 30, 2009, 7:29:06 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:

df7018f

Parents:

33539f7

git-author:

Alex Dehnert <adehnert@mit.edu> (05/28/09 05:19:05)

git-committer:

Alex Dehnert <adehnert@mit.edu> (05/30/09 19:29:06)

Message:

Include non-default class in personal_context

I think this turns out to be a no-op, because
only the default class is ever set. Regardless,
this feels like the right thing to do.

Also, slightly refactors to make getting a
-c class -i instance string without default class
or instance easier.

Further, quotes instance in personal context,
which seems reasonable since the syntax seems
intended to be that of zwrite.

File:

• perlwrap.pm (modified) (2 diffs)

perlwrap.pm

@@ -605 +605 @@
 }
 
+# Portion of the reply command that preserves the context
+sub context_reply_cmd {
+    my $m = shift;
+    my $class = "";
+    if (lc($m->class) ne "message") {
+        $class = "-c " . BarnOwl::quote($m->class);
+    }
+    my $instance = "";
+    if (lc($m->instance) ne "personal") {
+        $instance = "-i " . BarnOwl::quote($m->instance);
+    }
+    if (($class eq "") or  ($instance eq "")) {
+        return $class . $instance;
+    } else {
+        return $class . " " . $instance;
+    }
+}
+
 sub personal_context {
     my ($m) = @_;
-    if (lc($m->instance) eq "personal") {
-        return "";
-    } else {
-        return "-i " . $m->instance;
-    }
+    return $m->context_reply_cmd();
 }
 
@@ -681 +695 @@
     }
 
-    if (lc $class ne 'message') {
-        $cmd .= " -c " . BarnOwl::quote($class);
-    }
-    if (lc $instance ne 'personal') {
-        $cmd .= " -i " . BarnOwl::quote($instance);
-    }
+    my $context_part = $self->context_reply_cmd();
+    $cmd .= " " . $context_part unless ($context_part eq '');
     if ($to ne '') {
         $to = strip_realm($to);