Index: flickr_attach.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flickr_attach/flickr_attach.module,v
retrieving revision 1.2
diff -u -p -r1.2 flickr_attach.module
--- flickr_attach.module	9 Jun 2009 21:11:14 -0000	1.2
+++ flickr_attach.module	18 Jun 2009 04:02:11 -0000
@@ -122,7 +122,7 @@ function flickr_attach_form_alter(&$form
 	
 	if($form_id == 'node_type_form') {
 		$node_name = $form['#node_type']->name;
-		
+		$node_type = $form['#node_type']->type;
 		//the node_type form automatically appends _"node_type" 
 		//where "node_type" is the system name of this node type.
 		//the node_type form also automatically set_variable()s these
@@ -131,7 +131,8 @@ function flickr_attach_form_alter(&$form
 		$form['flickr_attach'] = array('#type' => 'fieldset', '#collapsible' => true,
 			'#title' => t('Flickr Attachment'),
 			$key => array(
-				'#type' => 'checkbox', '#default_value' => variable_get($key, true),
+				'#type' => 'checkbox', 
+				'#default_value' => variable_get($key . '_' . $node_type, true),
 				'#title' => t('Yes, allow Flickr Image & Album Attachments for !node_name nodes.',
 				 						array('!node_name' => $node_name))
 			),
@@ -595,4 +596,4 @@ function flickr_attach_views_handlers() 
         ),
       ),
     );
-}
\ No newline at end of file
+}