Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.module,v
retrieving revision 1.1.2.1.2.2
diff -u -p -r1.1.2.1.2.2 views_slideshow_thumbnailhover.module
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module	28 Aug 2009 05:25:16 -0000	1.1.2.1.2.2
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.module	25 Sep 2009 21:46:18 -0000
@@ -22,35 +22,35 @@ function views_slideshow_thumbnailhover_
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_controls' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_previous' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_pause' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_control_next' =>array(
-      'arguments' => array('id' => '', 'view' => NULL, 'options' => array()),
+      'arguments' => array('vss_id' => '', 'view' => NULL, 'options' => array()),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_breakout_teaser' => array(
-      'arguments' => array('item' => NULL, 'id' => NULL, 'count' => NULL),
+      'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_no_display_section' => array(
-      'arguments' => array('view' => NULL, 'rows' => NULL, 'id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
+      'arguments' => array('view' => NULL, 'rows' => NULL, 'vss_id' => NULL, 'mode' => NULL, 'teaser' => TRUE),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_no_display_teaser' => array(
-      'arguments' => array('item' => NULL, 'id' => NULL, 'count' => NULL),
+      'arguments' => array('item' => NULL, 'vss_id' => NULL, 'count' => NULL),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
     'views_slideshow_thumbnailhover_breakout_teasers' => array(
-      'arguments' => array('items' => NULL, 'id' => NULL),
+      'arguments' => array('items' => NULL, 'vss_id' => NULL),
       'file' => 'views_slideshow_thumbnailhover.theme.inc',
     ),
   );
Index: contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_thumbnailhover/Attic/views_slideshow_thumbnailhover.theme.inc,v
retrieving revision 1.1.2.1.2.6
diff -u -p -r1.1.2.1.2.6 views_slideshow_thumbnailhover.theme.inc
--- contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc	19 Sep 2009 18:44:52 -0000	1.1.2.1.2.6
+++ contrib/views_slideshow_thumbnailhover/views_slideshow_thumbnailhover.theme.inc	25 Sep 2009 21:46:18 -0000
@@ -46,7 +46,7 @@ function template_preprocess_views_slide
 /**
  *  These are the slideshow elements themselves; not actually displayed, but used to give the html to the main element.
  */
-function theme_views_slideshow_thumbnailhover_no_display_section($view, $rows, $id, $mode, $teaser = TRUE) {
+function theme_views_slideshow_thumbnailhover_no_display_section($view, $rows, $vss_id, $mode, $teaser = TRUE) {
   // Add support for the jQuery Cycle plugin.
   // If we have the jQ module installed, use that to add the Cycle plugin if possible.
   // That allows for version control.
@@ -60,9 +60,9 @@ function theme_views_slideshow_thumbnail
   if (!$js) {
     drupal_add_js(drupal_get_path('module', 'views_slideshow') .'/js/jquery.cycle.all.min.js', 'module');
   }
-  $output = '<div id="views_slideshow_thumbnailhover_teaser_section_' . $id . '" class="views_slideshow_thumbnailhover_teaser_section">' . "\n";
+  $output = '<div id="views_slideshow_thumbnailhover_teaser_section_' . $vss_id . '" class="views_slideshow_thumbnailhover_teaser_section">' . "\n";
   foreach ($view->result as $count => $node) {
-    $output .= theme('views_slideshow_thumbnailhover_no_display_teaser', node_view(node_load($node->nid), $teaser, FALSE, FALSE), $id, $count);
+    $output .= theme('views_slideshow_thumbnailhover_no_display_teaser', node_view(node_load($node->nid), $teaser, FALSE, FALSE), $vss_id, $count);
   }
   $output .= "</div><!--close views_slideshow_thumbnailhover_no_display-->\n\n";
   return $output;
@@ -71,23 +71,23 @@ function theme_views_slideshow_thumbnail
 /**
  *  The html that will be placed into the element in its turn during its frame.
  */
-function theme_views_slideshow_thumbnailhover_no_display_teaser($item, $id, $count) {
+function theme_views_slideshow_thumbnailhover_no_display_teaser($item, $vss_id, $count) {
   $class = 'class="views_slideshow_thumbnailhover_slide' . ($count ? ' views_slideshow_thumbnailhover_hidden"' : '"');
-  $output = '  <div id="views_slideshow_thumbnailhover_div_' . $id . '_' . $count . '" '. $class .'>' . "\n  ";
+  $output = '  <div id="views_slideshow_thumbnailhover_div_' . $vss_id . '_' . $count . '" '. $class .'>' . "\n  ";
   $output .= $item . "\n";
-  $output .= '  </div><!--close views_slideshow_thumbnailhover_div_' . $id . '_' . $count . '-->' . "\n\n";
+  $output .= '  </div><!--close views_slideshow_thumbnailhover_div_' . $vss_id . '_' . $count . '-->' . "\n\n";
   return $output;
 }
 
 /**
  *  These are teasers that may be pointed at with a mouse to change the element directly.
  */
-function theme_views_slideshow_thumbnailhover_breakout_teasers($items, $id) {
-  $output = '<div id="views_slideshow_thumbnailhover_breakout_teasers_' . $id . '" class="views_slideshow_thumbnailhover_breakout_teasers clear-block">' . "\n";
+function theme_views_slideshow_thumbnailhover_breakout_teasers($items, $vss_id) {
+  $output = '<div id="views_slideshow_thumbnailhover_breakout_teasers_' . $vss_id . '" class="views_slideshow_thumbnailhover_breakout_teasers clear-block">' . "\n";
   $js = "$(document).ready(function() {\n";
   foreach ($items as $count => $item) {
-    $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $id, $count);
-    $js .= theme('views_slideshow_thumbnailhover_breakout_teaser_js', $id, $count);
+    $output .= theme('views_slideshow_thumbnailhover_breakout_teaser', $item, $vss_id, $count);
+    $js .= theme('views_slideshow_thumbnailhover_breakout_teaser_js', $vss_id, $count);
   }
   $js .= "})\n";
   drupal_add_js($js, 'inline');
@@ -100,7 +100,7 @@ function theme_views_slideshow_thumbnail
 /**
  *  An individual breakout teaser.
  */
-function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $id, $count) {
+function theme_views_slideshow_thumbnailhover_breakout_teaser($item, $vss_id, $count) {
   $class = 'views_slideshow_thumbnailhover_div_breakout_teaser';
   if (!$count) {
     $class .= ' views_slideshow_thumbnailhover_active_teaser';
@@ -112,9 +112,9 @@ function theme_views_slideshow_thumbnail
   else {
     $class .= ' views-row-odd';
   }
-  $output = '  <div id="views_slideshow_thumbnailhover_div_breakout_teaser_' . $id . '_' . $count . '" class="' . $class . '">' . "\n  ";
+  $output = '  <div id="views_slideshow_thumbnailhover_div_breakout_teaser_' . $vss_id . '_' . $count . '" class="' . $class . '">' . "\n  ";
   $output .= $item . "\n";
-  $output .= '  </div><!--close views_slideshow_thumbnailhover_div_breakout_teaser_' . $id . '_' . $count . '-->' . "\n\n";
+  $output .= '  </div><!--close views_slideshow_thumbnailhover_div_breakout_teaser_' . $vss_id . '_' . $count . '-->' . "\n\n";
   return $output;
 }
 
@@ -122,11 +122,11 @@ function theme_views_slideshow_thumbnail
 /**
  * Themed slideshow controls.
  */
-function theme_views_slideshow_thumbnailhover_controls($id, $view, $options) {
-  $output = '<div class="views_slideshow_thumbnailhover_controls" id="views_slideshow_thumbnailhover_controls_' . $id . '">' . "\n";
-  $output .= theme('views_slideshow_thumbnailhover_control_previous', $id, $view, $options);
-  $output .= theme('views_slideshow_thumbnailhover_control_pause', $id, $view, $options);
-  $output .= theme('views_slideshow_thumbnailhover_control_next', $id, $view, $options);
+function theme_views_slideshow_thumbnailhover_controls($vss_id, $view, $options) {
+  $output = '<div class="views_slideshow_thumbnailhover_controls" id="views_slideshow_thumbnailhover_controls_' . $vss_id . '">' . "\n";
+  $output .= theme('views_slideshow_thumbnailhover_control_previous', $vss_id, $view, $options);
+  $output .= theme('views_slideshow_thumbnailhover_control_pause', $vss_id, $view, $options);
+  $output .= theme('views_slideshow_thumbnailhover_control_next', $vss_id, $view, $options);
   $output .= "</div>\n";
   return $output;
 }
@@ -134,20 +134,20 @@ function theme_views_slideshow_thumbnail
 /**
  * Themed Previous Control
  */
-function theme_views_slideshow_thumbnailhover_control_previous($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_thumbnailhover_prev_' . $id . '" class="views_slideshow_thumbnailhover_previous">' . t('Previous') . "</a>\n";
+function theme_views_slideshow_thumbnailhover_control_previous($vss_id, $view, $options) {
+  return '<a href="#" id="views_slideshow_thumbnailhover_prev_' . $vss_id . '" class="views_slideshow_thumbnailhover_previous">' . t('Previous') . "</a>\n";
 }
 
 /**
  * Themed Pause Control
  */
-function theme_views_slideshow_thumbnailhover_control_pause($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_thumbnailhover_playpause_' . $id . '" class="views_slideshow_thumbnailhover_pause">' . t('Pause') . "</a>\n";
+function theme_views_slideshow_thumbnailhover_control_pause($vss_id, $view, $options) {
+  return '<a href="#" id="views_slideshow_thumbnailhover_playpause_' . $vss_id . '" class="views_slideshow_thumbnailhover_pause">' . t('Pause') . "</a>\n";
 }
 
 /**
  * Themed Next Control
  */
-function theme_views_slideshow_thumbnailhover_control_next($id, $view, $options) {
-  return '<a href="#" id="views_slideshow_thumbnailhover_next_' . $id . '" class="views_slideshow_thumbnailhover_next">' . t('Next') . "</a>\n";
+function theme_views_slideshow_thumbnailhover_control_next($vss_id, $view, $options) {
+  return '<a href="#" id="views_slideshow_thumbnailhover_next_' . $vss_id . '" class="views_slideshow_thumbnailhover_next">' . t('Next') . "</a>\n";
 }