--- a/MPIWGStaff.py	Tue May 27 11:33:16 2014 +0200
+++ b/MPIWGStaff.py	Tue May 27 11:33:57 2014 +0200
@@ -19,7 +19,7 @@
 import datetime
 
 from Products.ZDBInterface.ZDBInterfaceFolder import ZDBInterfaceFolder
-from Products.MPIWGManager.MPIWGIcsManager import MPIWGIcsManager
+from Products.MPIWGManager import MPIWGIcsManager
 
 from SrvTxtUtils import getInt, unicodify, utf8ify, sqlName, getPlaintext
 import MPIWGHelper
@@ -38,13 +38,6 @@
 manage_addMPIWGStaffForm = MPIWGStaff_old.manage_addMPIWGStaffForm
 manage_addMPIWGStaff = MPIWGStaff_old.manage_addMPIWGStaff
 
-# MPIWGManager properties for ICS-calendars
-# (ID_EN, ID_DE, VALUE_EN, VALUE_DE, WEIGHT, ID)
-calendar_props = [('Description', 'Beschreibung', None, None, 0, 'description'), 
-             ('Location', 'Ort', None, None, 0, 'location'),
-             ('URL', 'URL', None, None, 0, 'url'),
-             ('Time', 'Zeit', None, None, 0, 'time')]
-
     
 class MPIWGStaffFolder(ZDBInterfaceFolder):
     """Folder of staff objects"""
@@ -613,7 +606,7 @@
                 cal = self.getTalksCal()
                 if cal is None:
                     # create new calendar
-                    cal = MPIWGIcsManager(cal_id, '', url, defaultProps=calendar_props)
+                    cal = MPIWGIcsManager.MPIWGIcsManager(cal_id, '', url, defaultProps=MPIWGIcsManager.calendar_props)
                     self.folder.get('calendars')[cal_id] = cal
                     
                 else:
@@ -621,7 +614,7 @@
                     if cal.url != url:
                         # remove and re-create
                         del self.folder.get('calendars')[cal_id]
-                        cal = MPIWGIcsManager(cal_id, '', url, defaultProps=calendar_props)
+                        cal = MPIWGIcsManager.MPIWGIcsManager(cal_id, '', url, defaultProps=MPIWGIcsManager.calendar_props)
                         self.folder.get('calendars')[cal_id] = cal
 
                 # show only upcoming