[1059] in BarnOwl Developers
[D-O-H] r1042 - trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:12:36 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@MIT.EDU
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 12 May 2008 19:03:52 -0400 (EDT)
Author: nelhage
Date: 2008-05-12 19:03:51 -0400 (Mon, 12 May 2008)
New Revision: 1042
Modified:
trunk/owl/perlwrap.pm
Log:
* Move time_hhmm into a format_time method
* Remove prototypes from perlwrap.pm
Modified: trunk/owl/perlwrap.pm
===================================================================
--- trunk/owl/perlwrap.pm 2008-05-12 18:54:42 UTC (rev 1041)
+++ trunk/owl/perlwrap.pm 2008-05-12 23:03:51 UTC (rev 1042)
@@ -778,7 +778,7 @@
################################################################################
# Branching point for various formatting functions in this style.
################################################################################
-sub format_message($)
+sub format_message
{
my $self = shift;
my $m = shift;
@@ -809,13 +809,14 @@
################################################################################
-sub time_hhmm {
+sub format_time {
my $m = shift;
+ my $m = shift;
my ($time) = $m->time =~ /(\d\d:\d\d)/;
return $time;
}
-sub format_login($) {
+sub format_login {
my $self = shift;
my $m = shift;
return sprintf(
@@ -824,7 +825,7 @@
$m->login_type,
$m->pretty_sender,
$m->login_extra,
- time_hhmm($m)
+ $self->format_time($m)
);
}
@@ -840,7 +841,7 @@
return "\@bold(OWL ADMIN)\n" . $self->indent_body($m);
}
-sub format_chat($) {
+sub format_chat {
my $self = shift;
my $m = shift;
my $header = $self->chat_header($m);
@@ -868,7 +869,7 @@
if($m->opcode) {
$header .= " [" . $m->opcode . "]";
}
- $header .= " " . time_hhmm($m);
+ $header .= " " . $self->format_time($m);
$header .= $self->format_sender($m);
return $header;
}
@@ -881,7 +882,7 @@
return " (" . $sender . '@color[default]' . ")";
}
-sub indent_body($)
+sub indent_body
{
my $self = shift;
my $m = shift;
@@ -917,7 +918,7 @@
################################################################################
-sub format_login($) {
+sub format_login {
my $self = shift;
my $m = shift;
return sprintf(
@@ -929,7 +930,7 @@
. ($m->login_extra ? "at ".$m->login_extra : '');
}
-sub format_ping($) {
+sub format_ping {
my $self = shift;
my $m = shift;
return sprintf(
@@ -940,7 +941,7 @@
$m->pretty_sender)
}
-sub format_chat($)
+sub format_chat
{
my $self = shift;
my $m = shift;
@@ -980,7 +981,7 @@
}
# Format owl admin messages
-sub format_admin($)
+sub format_admin
{
my $self = shift;
my $m = shift;
@@ -994,7 +995,7 @@
# This takes a zephyr to be displayed and modifies it to be displayed
# entirely in bold.
-sub boldify($)
+sub boldify
{
local $_ = shift;
if ( !(/\)/) ) {
