--- event.module_orig	2009-09-17 12:42:10.000000000 +0200
+++ event.module	2009-09-17 14:59:21.000000000 +0200
@@ -948,10 +948,32 @@
   $event = $node->event;
   $event['uid'] = $node->uid;
   $event['summary'] = $node->title;
-  $event['description'] = check_markup($node->teaser ? $node->teaser : $node->body, $node->format);
+  // $event['description'] = check_markup($node->teaser ? $node->teaser : $node->body, $node->format);
+  $event['description'] = $node->body;
   $event['uid'] = url("node/$node->nid", array('absolute' => TRUE));
   $event['url'] = url("node/$node->nid", array('absolute' => TRUE));
 
+  if (module_exists('location')){
+    $location = $node->location;
+    
+    if ($location){
+       $places = array();
+       $fields = array('name','street','postal_code','city','province_name', 'country_name');
+       foreach ($fields as $place){
+          if (isset($location[$place]) and $location[$place] != ''){
+	     array_push($places, $location[$place]);
+          }
+       }
+       $place = join(', ', $places);
+       
+       if (location_has_coordinates($location)){
+       	  $place .= ';ALTREP=LATITUDE=' . $location['latitude'] . ', LONGITUDE=' . $location['longitude'];
+       }
+
+       $event['location'] = $place;
+    }
+  }
+
   return $event;
 }