Changes in / [73ba824:315babf]

Files:

• owl.c (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Message/IRC.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm (modified) (1 diff)
• perlwrap.pm (modified) (4 diffs)

owl.c

@@ -243 +243 @@
   f=owl_malloc(sizeof(owl_filter));
   owl_filter_init_fromstring(f, "personal", "isprivate ^true$ and ( not type ^zephyr$"
-                             " or ( class ^message and"
-                             " ( instance ^personal$ or instance ^urgent$ ) ) )");
+                             " or ( class ^message  ) )");
   owl_list_append_element(owl_global_get_filterlist(&g), f);
 

perl/modules/IRC/lib/BarnOwl/Message/IRC.pm

@@ -70 +70 @@
 sub context {shift->{network};}
 sub subcontext {shift->{recipient};}
+sub personal_context {"on " . shift->{network};}
 
 sub long_sender {shift->{from} || ""};

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

@@ -50 +50 @@
 sub subcontext {
     return shift->subject || "";
+}
+
+sub personal_context {
+    my $self = shift;
+    if ($self->is_incoming) {
+        return "to " . $self->to;
+    } else {
+        return "from " . $self->from;
+    }
 }
 

perlwrap.pm

@@ -390 +390 @@
 sub pretty_sender    { return shift->sender; }
 sub pretty_recipient { return shift->recipient; }
+
+# Override if you want a context (instance, network, etc.) on personals
+sub personal_context { return ""; }
 
 sub delete {
@@ -584 +587 @@
     my ($m) = @_;
     return ((lc($m->class) eq "message")
-            && (lc($m->instance) eq "personal")
             && $m->is_private);
 }
@@ -601 +603 @@
     my ($m) = @_;
     return strip_realm($m->recipient);
+}
+
+sub personal_context {
+    my ($m) = @_;
+    if (lc($m->instance) eq "personal") {
+        return "";
+    } else {
+        return "-i " . $m->instance;
+    }
 }
 
@@ -1023 +1034 @@
     my $header;
     if ( $m->is_personal ) {
+        my $personal_context = $m->personal_context;
+        $personal_context = ' [' . $personal_context . ']' if $personal_context;
+
         if ( $m->direction eq "out" ) {
-            $header = ucfirst $m->type . " sent to " . $m->pretty_recipient;
+            $header = ucfirst $m->type . $personal_context . " sent to " . $m->pretty_recipient;
         } else {
-            $header = ucfirst $m->type . " from " . $m->pretty_sender;
+            $header = ucfirst $m->type . $personal_context . " from " . $m->pretty_sender;
         }
     } else {