Index: feedapi_node/feedapi_node.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi_node/Attic/feedapi_node.install,v
retrieving revision 1.1.2.13.2.5
diff -u -r1.1.2.13.2.5 feedapi_node.install
--- feedapi_node/feedapi_node.install	5 Jun 2008 20:06:16 -0000	1.1.2.13.2.5
+++ feedapi_node/feedapi_node.install	15 Jul 2008 09:40:52 -0000
@@ -104,5 +104,6 @@
   drupal_uninstall_schema('feedapi_node');
   node_type_delete('feedapi_node');
   variable_del('feedapi_settings_feedapi_node');
+  variable_del('feedapi_node_content_type');
   menu_rebuild();
 }
Index: feedapi_node/feedapi_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi_node/Attic/feedapi_node.module,v
retrieving revision 1.1.2.18.2.9
diff -u -r1.1.2.18.2.9 feedapi_node.module
--- feedapi_node/feedapi_node.module	28 Apr 2008 21:38:23 -0000	1.1.2.18.2.9
+++ feedapi_node/feedapi_node.module	15 Jul 2008 09:40:53 -0000
@@ -100,6 +100,27 @@
   }
 }
 
+function feedapi_node_form_feedapi_admin_settings_alter(&$form, $form_state) {
+  $form['feedapi_allowed_html_tags']['#weight'] = -5;
+  $form['feedapi_allow_html_all']['#weight'] = -5;
+  $form['feedapi_cron_percentage']['#weight'] = -5;
+
+  $form['feedapi_node'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('FeedAPI Node settings'),
+    '#collapsible' => TRUE,
+    '#collapsed' => FALSE,
+    '#weight' => 0,
+  );
+  $form['feedapi_node']['feedapi_node_content_type'] = array(
+    '#type' => 'select',
+    '#title' => t('Default content type for feed items'),
+    '#default_value' => variable_get('feedapi_node_content_type', 'story'),
+    '#options' => node_get_types('names'),
+    '#description' => t('Select the default content type for feed item nodes to be used by FeedAPI Node processor.'),
+  );
+}
+
 /**
  * Implementation of hook_feedapi_settings_form().
  * If a module provides parsers and processors it MUST evaluate the $type variable
@@ -111,18 +132,11 @@
   
   switch ($type) {
     case 'processors':
-      $ct_types = node_get_types();
-      $ct_options = array();
-      if (is_array($ct_types)) {
-        foreach ($ct_types as $key => $data) {
-          $ct_options[$key] = $data->name;
-        }
-      }
       $form['content_type'] = array(
         '#type' => 'select',
         '#title' => t('Node type of feed items'),
-        '#default_value' => 'story',
-        '#options' => $ct_options,
+        '#default_value' => variable_get('feedapi_node_content_type', 'story'),
+        '#options' => node_get_types('names'),
         '#description' => t('Choose the node type for feed item nodes created by this feed.'),
       );
       $form['node_date'] = array(
@@ -243,7 +257,7 @@
   if (isset($feed_item->nid)) {
     $node->nid = $feed_item->nid;
   }
-  $node->type = !empty($settings['content_type']) ? $settings['content_type'] : variable_get('feedapi_node_type', 'story');
+  $node->type = !empty($settings['content_type']) ? $settings['content_type'] : variable_get('feedapi_node_content_type', 'story');
   // Get the default options from the cont
   $options = variable_get('node_options_'. $node->type, FALSE);
   if (is_array($options)) {
