Index: taxonomy_image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_image/taxonomy_image.module,v
retrieving revision 1.12.4.21
diff -u -r1.12.4.21 taxonomy_image.module
--- taxonomy_image.module	23 Mar 2008 15:24:02 -0000	1.12.4.21
+++ taxonomy_image.module	24 Mar 2008 17:46:38 -0000
@@ -403,8 +403,21 @@
 
   $ic_exists = module_exists('imagecache');
   if ($ic_exists) {
-    $presets = _imagecache_get_presets();
-//    $presets[0] = '<none>';
+    if (function_exists('_imagecache_get_presets')) {
+      $presets = _imagecache_get_presets();
+    }
+    elseif (function_exists('imagecache_presets')) {
+      $ic_presets = imagecache_presets();
+      $presets = array();
+      foreach($ic_presets as $preset_id => $preset_info) {
+        $presets[$preset_info['presetid']] = $preset_info['presetname'];
+      }
+    }
+    else {
+      $msg = t('Unrecognized Imagecache API.');
+      drupal_set_message($msg, 'error');
+      return array('oops' => array('#value' => $msg));
+    }
     $presets[0] = 'ORIGINAL';
     sort($presets);
 
@@ -529,12 +542,24 @@
   );
 
   if (module_exists('imagecache')) {
+    if (function_exists('_imagecache_get_presets')) {
       $raw_presets = _imagecache_get_presets();      
       $presets = array();
       foreach ($raw_presets as $preset) {
-          $presets[$preset] = $preset;
-          $presets["{$preset}_link"] = "{$preset} as link";
+        $presets[$preset] = $preset;
+        $presets["{$preset}_link"] = "{$preset} as link";
       }
+    }
+    elseif (function_exists('imagecache_presets')) {
+      $raw_presets = imagecache_presets();
+      $presets = array();
+      foreach($raw_presets as $preset_id => $preset_info) {
+        $preset = $preset_info['presetname'];
+        $presets[$preset] = $preset;
+        $presets["{$preset}_link"] = "{$preset} as link";
+      }
+    }
+
       $presets[''] = 'Default';
       $tables['term_image']['fields']['tid']['option'] = array(
          '#type' => 'select',