--- Driver.php.orig	2006-02-14 01:07:22.277169184 +0100
+++ Driver.php	2006-02-14 01:15:19.396636000 +0100
@@ -194,7 +194,27 @@
             $params = Horde::getDriverConfig('calendar', $driver);
         }
 
+        $depdriver = $GLOBALS['conf']['calendar']['depdriver'];
+        $depdriver = basename($depdriver);
+	if (!is_null($depdriver)) {
+            Horde::logMessage(sprintf('About to load dependent driver %s ...',$depdriver),
+                          __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+            include_once dirname(__FILE__) . '/Driver/' . $depdriver . '.php';
+
+            Horde::logMessage(sprintf('Done loading %s ...',$depdriver),
+                          __FILE__, __LINE__, PEAR_LOG_DEBUG);
+        }
+
+        Horde::logMessage(sprintf('About to load driver %s ...',$driver),
+                      __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
         include_once dirname(__FILE__) . '/Driver/' . $driver . '.php';
+
+        Horde::logMessage(sprintf('Done loading %s ...',$driver),
+                      __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+
         $class = 'Kronolith_Driver_' . $driver;
         if (class_exists($class)) {
             $driver = &new $class($params);
@@ -479,7 +499,7 @@
      *
      * @return Horde_iCalendar_vevent  The vEvent object for this event.
      */
-    function &toiCalendar(&$calendar, $identity)
+    function &toiCalendar(&$calendar, $identity = null)
     {
         global $prefs;
 
@@ -500,9 +520,11 @@
         $vEvent->setAttribute('UID', $this->_uid);
         $vEvent->setAttribute('SUMMARY', $this->title);
         $vEvent->setAttribute('TRANSP', 'OPAQUE');
-        $vEvent->setAttribute('ORGANIZER',
-                              'MAILTO:' . $identity->getValue('from_addr'),
-                              array('CN' => $identity->getValue('fullname')));
+        if ($identity != null) {
+            $vEvent->setAttribute('ORGANIZER',
+                                  'MAILTO:' . $identity->getValue('from_addr'),
+                                  array('CN' => $identity->getValue('fullname')));
+        }
         if (!empty($this->description)) {
             $vEvent->setAttribute('DESCRIPTION', $this->description);
         }