From a27db899f80aad40df23f926de11e4b006210d59 Mon Sep 17 00:00:00 2001
From: Adrian Moennich <adrian.moennich@cern.ch>
Date: Fri, 31 Mar 2017 09:25:05 +0200
Subject: [PATCH] Adapt to 1.9.10.dev2 changes

---
 chat/indico_chat/views.py          | 1 -
 chat/setup.py                      | 4 ++--
 vc_vidyo/indico_vc_vidyo/plugin.py | 5 ++---
 vc_vidyo/setup.py                  | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/chat/indico_chat/views.py b/chat/indico_chat/views.py
index ac95c7e..375aa43 100644
--- a/chat/indico_chat/views.py
+++ b/chat/indico_chat/views.py
@@ -27,7 +27,6 @@ class WPChatEventPage(WPJinjaMixinPlugin, WPConferenceDefaultDisplayBase):
     def __init__(self, rh, conf, **kwargs):
         WPConferenceDefaultDisplayBase.__init__(self, rh, conf, **kwargs)
         self._conf = conf
-        self._aw = rh.getAW()
 
     def _getBody(self, params):
         return self._getPageContent(params)
diff --git a/chat/setup.py b/chat/setup.py
index 3cfe026..498c025 100644
--- a/chat/setup.py
+++ b/chat/setup.py
@@ -21,7 +21,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='indico_chat',
-    version='0.5',
+    version='0.5.1',
     url='https://github.com/indico/indico-plugins',
     license='https://www.gnu.org/licenses/gpl-3.0.txt',
     author='Indico Team',
@@ -31,7 +31,7 @@ setup(
     include_package_data=True,
     platforms='any',
     install_requires=[
-        'indico>=1.9.6',
+        'indico>=1.9.10.dev2',
         'sleekxmpp'
     ],
     classifiers=[
diff --git a/vc_vidyo/indico_vc_vidyo/plugin.py b/vc_vidyo/indico_vc_vidyo/plugin.py
index b86ece6..a97cb38 100644
--- a/vc_vidyo/indico_vc_vidyo/plugin.py
+++ b/vc_vidyo/indico_vc_vidyo/plugin.py
@@ -27,6 +27,7 @@ from indico.core.auth import multipass
 from indico.core.config import Config
 from indico.core.plugins import IndicoPlugin, url_for_plugin
 from indico.core import signals
+from indico.modules.events.views import WPSimpleEventDisplay
 from indico.modules.vc.exceptions import VCRoomError, VCRoomNotFoundError
 from indico.modules.vc import VCPluginSettingsFormBase, VCPluginMixin
 from indico.modules.vc.views import WPVCEventPage, WPVCManageEvent
@@ -44,8 +45,6 @@ from indico_vc_vidyo.http_api import DeleteVCRoomAPI
 from indico_vc_vidyo.util import iter_user_identities, iter_extensions, update_room_from_obj
 from indico_vc_vidyo.models.vidyo_extensions import VidyoExtension
 
-from indico.legacy.webinterface.pages.conferences import WPTPLConferenceDisplay
-
 
 class PluginSettingsForm(VCPluginSettingsFormBase):
     support_email = EmailField(_('Vidyo email support'))
@@ -86,7 +85,7 @@ class VidyoPlugin(VCPluginMixin, IndicoPlugin):
     def init(self):
         super(VidyoPlugin, self).init()
         self.connect(signals.plugin.cli, self._extend_indico_cli)
-        self.inject_js('vc_vidyo_js', WPTPLConferenceDisplay)
+        self.inject_js('vc_vidyo_js', WPSimpleEventDisplay)
         self.inject_js('vc_vidyo_js', WPVCEventPage)
         self.inject_js('vc_vidyo_js', WPVCManageEvent)
         HTTPAPIHook.register(DeleteVCRoomAPI)
diff --git a/vc_vidyo/setup.py b/vc_vidyo/setup.py
index 0060f40..acd2eca 100644
--- a/vc_vidyo/setup.py
+++ b/vc_vidyo/setup.py
@@ -21,7 +21,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='indico_vc_vidyo',
-    version='0.3',
+    version='0.4',
     url='https://github.com/indico/indico-plugins',
     license='https://www.gnu.org/licenses/gpl-3.0.txt',
     author='Indico Team',
@@ -31,7 +31,7 @@ setup(
     include_package_data=True,
     platforms='any',
     install_requires=[
-        'indico>=1.9.3',
+        'indico>=1.9.10.dev2',
         'suds-jurko'
     ],
     classifiers=[