From 13b3a1fb27bbd6ddab157f3adea4d8717e25beaa Mon Sep 17 00:00:00 2001
From: ArtyomLosev <losev@it-projects.info>
Date: Tue, 28 Nov 2017 15:53:48 +0500
Subject: [PATCH] [PORT] mail_base to 11.0

---
 mail_base/static/lib/base.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/mail_base/static/lib/base.js b/mail_base/static/lib/base.js
index f694346..a32d63e 100644
--- a/mail_base/static/lib/base.js
+++ b/mail_base/static/lib/base.js
@@ -435,7 +435,7 @@ chat_manager.on_notification = function (notifications) {
             chat_manager.on_partner_notification(notification[1]);
         } else if (model === 'bus.presence') {
             // update presence of users
-            on_presence_notification(notification[1]);
+            chat_manager.on_presence_notification(notification[1]);
         }
     });
 }
@@ -662,13 +662,13 @@ chat_manager.start = function () {
             return session.rpc('/mail/client_action', {context: context});
         }).then(chat_manager._onMailClientAction.bind(this));
 
-    add_channel({
+    chat_manager.add_channel({
         id: "channel_inbox",
         name: _lt("Inbox"),
         type: "static",
     }, { display_needactions: true });
 
-    add_channel({
+    chat_manager.add_channel({
         id: "channel_starred",
         name: _lt("Starred"),
         type: "static"
@@ -1125,6 +1125,7 @@ chat_manager.close_chat_session = function (channel_id) {
             kwargs: {uuid : channel.uuid, state : 'closed'},
         }, {shadow: true});
 }
+
 chat_manager.fold_channel = function (channel_id, folded) {
     var args = {
         uuid: this.get_channel(channel_id).uuid,
@@ -1287,19 +1288,12 @@ chat_manager.search_partner = function (search_val, limit) {
     });
 }
 
-chat_manager.add_channel({
-    id: "channel_inbox",
-    name: _lt("Inbox"),
-    type: "static",
-}, { display_needactions: true });
-
-chat_manager.add_channel({
-    id: "channel_starred",
-    name: _lt("Starred"),
-    type: "static"
+chat_manager.start();
+bus.off('notification');
+bus.on('notification', null, function () {
+    chat_manager.on_notification.apply(chat_manager, arguments);
 });
 
-
 return {
     ODOOBOT_ID: ODOOBOT_ID,
     chat_manager: chat_manager,