--- C:\Documents and Settings\snarkador\Local Settings\Temp\svn000.tmp.module	Fri Nov 28 10:55:49 2008
+++ C:\apache2triad\htdocs\ippfwhr\sites\default\modules\nice_menus\nice_menus.module	Fri Nov 28 10:54:11 2008
@@ -203,7 +203,7 @@
  * @return
  *   An HTML string of properly nested nice menu lists.
  */
-function theme_nice_menu_tree($pid = 1, $menu = NULL) {
+function theme_nice_menus_tree($pid = 1, $menu = NULL) {
   $menu = isset($menu) ? $menu : menu_get_menu();
   $output['content'] = '';
 
@@ -234,6 +234,14 @@
   return $output;
 }
 
+
+/**
+ * DEPRECATED: Legacy function name. Will be removed in 7.x.
+ */
+function theme_nice_menu_tree($pid = 1, $menu = NULL) {
+  return theme('nice_menus_tree', $pid, $menu);
+}
+
 /**
  * General theming function to allow any menu tree to be themed 
  * as a nice menu.
@@ -251,7 +259,7 @@
  * @return
  *   An HTML string of nice menu links.
  */
-function theme_nice_menu($id, $pid, $direction = 'right', $menu = NULL) {
+function theme_nice_menus($id, $pid, $direction = 'right', $menu = NULL) {
   $output = array();
 
   if ($menu_tree = theme('nice_menu_tree', $pid, $menu)) {
@@ -260,10 +268,19 @@
       $output['subject'] = $menu_tree['subject'];
     }
   }
+  
+  echo('<pre>the menu is '. print_r($output['content'], 1) .'</pre>');
   return $output;
 }
 
 /**
+ * DEPRECATED: Legacy function name. Will be removed in 7.x.
+ */
+function theme_nice_menu($id, $pid, $direction = 'right', $menu = NULL) {
+  return theme('nice_menus', $id, $pid, $direction = 'right', $menu = NULL);
+}
+
+/**
  * Theme primary links as nice menus
  *
  * @param $direction
@@ -275,8 +292,15 @@
  * @return
  *   An HTML string of nice menu primary links.
  */
-function theme_nice_menu_primary_links($direction = 'down', $menu = NULL) {
+function theme_nice_menus_primary_links($direction = 'down', $menu = NULL) {
   $pid = variable_get('menu_primary_menu', 0);
   $output = theme('nice_menu', 'primary', $pid, $direction, $menu);
   return $output['content'];
+}
+
+/**
+ * DEPRECATED: Legacy function name. Will be removed in 7.x.
+ */
+function theme_nice_menu_primary_links($direction = 'down', $menu = NULL) {
+  return theme('nice_menus_primary_links', $direction = 'down', $menu = NULL);
 }