Index: calendar.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/calendar/calendar.inc,v
retrieving revision 1.13.2.16
diff -u -p -r1.13.2.16 calendar.inc
--- calendar.inc	3 Mar 2008 06:37:06 -0000	1.13.2.16
+++ calendar.inc	5 Apr 2008 21:56:44 -0000
@@ -194,7 +194,7 @@ function calendar_build_calendar($view, 
 
   // Add the navigation in as the header.
   $header = calendar_nav($view, $view->mini, $params['with_weekno']);
-  $output = theme_calendar_links($view, $view->build_type != 'block');
+  $output = theme("calendar_links", $view, $view->build_type != 'block');
   $output .= theme('calendar_'. $view->calendar_type, $view, $header, $rows);
   return $output;
 }
Index: calendar.theme
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/calendar/calendar.theme,v
retrieving revision 1.37.2.10
diff -u -p -r1.37.2.10 calendar.theme
--- calendar.theme	22 Feb 2008 15:14:55 -0000	1.37.2.10
+++ calendar.theme	5 Apr 2008 21:56:45 -0000
@@ -64,7 +64,7 @@ function theme_calendar_views_calendar(&
  */
 function theme_calendar_view_list($view, $nodes, $type) {
   $output  = '<div class="calendar-calendar">';
-  $output .= theme_calendar_links($view, $view->build_type != 'block');
+  $output .= theme("calendar_links", $view, $view->build_type != 'block');
   $output .= theme("table", calendar_nav($view), array());
   $output .= '</div>';
 
@@ -97,7 +97,7 @@ function theme_calendar_view_list($view,
  */
 function theme_calendar_view_table($view, $nodes, $type) {
   $output  = '<div class="calendar-calendar">';
-  $output .= theme_calendar_links($view, $view->build_type != 'block');
+  $output .= theme("calendar_links", $view, $view->build_type != 'block');
   $output .= theme("table", calendar_nav($view), array());
   $output .= '</div>';
 
@@ -130,7 +130,7 @@ function theme_calendar_view_teasers($vi
  */
 function theme_calendar_view_nodes($view, $nodes, $type, $teasers = false, $links = true) {
   $output  = '<div class="calendar-calendar">';
-  $output .= theme_calendar_links($view, $view->build_type != 'block');
+  $output .= theme("calendar_links", $view, $view->build_type != 'block');
   $output .= theme("table", calendar_nav($view), array());
   $output .= '</div>';
 
Index: calendar_ical.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/calendar/calendar_ical.module,v
retrieving revision 1.25.2.4
diff -u -p -r1.25.2.4 calendar_ical.module
--- calendar_ical.module	22 Feb 2008 15:14:55 -0000	1.25.2.4
+++ calendar_ical.module	5 Apr 2008 21:56:45 -0000
@@ -333,7 +333,7 @@ function theme_calendar_ical_node($node,
     // Create a pseudo node view for this item.
     $output  = '<div class="node">';
     $output .= '<h2>'. l($node->title, $node->url) .'</h2>';
-    $output .= '<div>'. theme_calendar_date_combo($node, $node->format, t('Dates'), $view)  .'</div>';
+    $output .= '<div>'. theme("calendar_date_combo", $node, $node->format, t('Dates'), $view)  .'</div>';
     $output .= '<div class="content">'. $node->teaser .'</div>';
     $output .= '</div>';
     return $output;