Changeset 7cc1092 for perl/lib/BarnOwl

Timestamp:

May 23, 2010, 12:48:40 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

9e88fa7

Parents:

89ab5c8 (diff), 5d1324f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'style-undef'

Location:

perl/lib/BarnOwl

Files:

• Message/Generic.pm (modified) (1 diff)
• Style/Default.pm (modified) (2 diffs)
• Hooks.pm (modified) (3 diffs)
• MainLoopCompatHook.pm (added)
• Timer.pm (modified) (2 diffs)

perl/lib/BarnOwl/Message/Generic.pm

@@ -6 +6 @@
 use base qw( BarnOwl::Message );
 
+sub body { "" }
+
 
 1;

perl/lib/BarnOwl/Style/Default.pm

@@ -32 +32 @@
     my $m = shift;
     return $m->is_personal && $m->direction eq "in";
+}
+
+sub maybe {
+    my $x = shift;
+    return defined($x) ? $x : "";
 }
 
@@ -99 +104 @@
             $header .= ' / ' . $self->humanize($m->subcontext, 1);
         }
-        $header .= ' / @b{' . $m->pretty_sender . '}';
+        $header .= ' / @b{' . maybe($m->pretty_sender) . '}';
     }
 

perl/lib/BarnOwl/Hooks.pm

@@ -79 +79 @@
 our %EXPORT_TAGS = (all => [@EXPORT_OK]);
 
+use BarnOwl::MainLoopCompatHook;
+
 our $startup = BarnOwl::Hook->new;
 our $shutdown = BarnOwl::Hook->new;
 our $receiveMessage = BarnOwl::Hook->new;
 our $newMessage = BarnOwl::Hook->new;
-our $mainLoop = BarnOwl::Hook->new;
+our $mainLoop = BarnOwl::MainLoopCompatHook->new;
 our $getBuddyList = BarnOwl::Hook->new;
 our $getQuickstart = BarnOwl::Hook->new;
@@ -162 +164 @@
     }
     
+    $mainLoop->check_owlconf();
     $startup->run(0);
     BarnOwl::startup() if *BarnOwl::startup{CODE};
@@ -186 +189 @@
     
     BarnOwl::new_msg($m) if *BarnOwl::new_msg{CODE};
-}
-
-sub _mainloop_hook {
-    $mainLoop->run;
-    BarnOwl::mainloop_hook() if *BarnOwl::mainloop_hook{CODE};
 }
 

perl/lib/BarnOwl/Timer.pm

@@ -21 +21 @@
 }
 
+sub stop {
+    my $self = shift;
+    if(defined($self->{timer})) {
+        BarnOwl::Internal::remove_timer($self->{timer});
+        undef $self->{timer};
+    }
+}
+
 sub do_callback {
     my $self = shift;
@@ -28 +36 @@
 sub DESTROY {
     my $self = shift;
-    if(defined($self->{timer})) {
-        BarnOwl::Internal::remove_timer($self->{timer});
-    }
+    $self->stop;
 }