Changes in perl/lib/BarnOwl/Hooks.pm [3aa0522:b30c256]

File:

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

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::MainLoopCompatHook->new;
+our $mainLoop = BarnOwl::Hook->new;
 our $getBuddyList = BarnOwl::Hook->new;
 our $getQuickstart = BarnOwl::Hook->new;
@@ -164 +162 @@
     }
     
-    $mainLoop->check_owlconf();
     $startup->run(0);
     BarnOwl::startup() if *BarnOwl::startup{CODE};
@@ -189 +186 @@
     
     BarnOwl::new_msg($m) if *BarnOwl::new_msg{CODE};
+}
+
+sub _mainloop_hook {
+    $mainLoop->run;
+    BarnOwl::mainloop_hook() if *BarnOwl::mainloop_hook{CODE};
 }