--- ../../../../../../tmp/kde-sj/quanta6oh46aHEAD	2005-08-29 20:55:07.035106144 +0200
+++ flexinode.module	2005-08-29 20:54:32.273390728 +0200
@@ -493,26 +493,17 @@
 }
 
 /**
- * Implementation of hook_node_types().
+ * Implementation of hook_node().
  */
-function flexinode_node_types() {
+function flexinode_node() {
   $types = array();
-  foreach (flexinode_content_types() as $type => $name) {
-    $types[] = 'flexinode-' . $type;
+  foreach (flexinode_content_types() as $type => $object) {
+    $types["flexinode-$type"] = array('name' => $object->name, 'base' => 'flexinode');
   }
   return $types;
 }
 
 /**
- * Implementation of hook_node_name().
- */
-function flexinode_node_name($node) {
-  $type = is_string($node) ? $node : (is_array($node) ? $node['type'] : $node->type);
-  $ctype = flexinode_load_content_type(substr($type, 10));
-  return $ctype->name ? t($ctype->name) : t('flexible content');
-}
-
-/**
  * Implementation of hook_access().
  */
 function flexinode_access($op, $node) {
