Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/queuemanager.php
	lib/xmppmanager.php
	plugins/Xmpp/Fake_XMPP.php
	scripts/imdaemon.php

1 files changed, 1 insertions, 15 deletions

diff --git a/lib/immanager.php b/lib/immanager.php
index 4c28ec0e6..da80b74b7 100644
--- a/lib/immanager.php
+++ b/lib/immanager.php
@@ -42,8 +42,7 @@ abstract class ImManager extends IoManager
     function __construct($imPlugin)
     {
         $this->plugin = $imPlugin;
-        //TODO We only really want to register this event if this is the thread that runs the ImManager
-        Event::addHandler('EndInitializeQueueManager', array($this, 'onEndInitializeQueueManager'));
+        $this->plugin->imManager = $this;
     }
 
     /**
@@ -54,17 +53,4 @@ abstract class ImManager extends IoManager
     {
         throw new Exception('ImManager should be created using it\'s constructor, not the static get method');
     }
-
-    /**
-     * Register notice queue handler
-     *
-     * @param QueueManager $manager
-     *
-     * @return boolean hook return
-     */
-    function onEndInitializeQueueManager($manager)
-    {
-        $manager->connect($this->plugin->transport . '-out', new ImSenderQueueHandler($this->plugin, $this), 'imdaemon');
-        return true;
-    }
 }