Index: activitystream_flickr/activitystream_flickr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activitystream/activitystream_flickr/activitystream_flickr.module,v
retrieving revision 1.2.2.6
diff -u -p -r1.2.2.6 activitystream_flickr.module
--- activitystream_flickr/activitystream_flickr.module	9 Nov 2009 22:41:49 -0000	1.2.2.6
+++ activitystream_flickr/activitystream_flickr.module	9 Mar 2010 10:09:53 -0000
@@ -32,19 +32,34 @@ function activitystream_flickr_streamapi
     watchdog('activitystream', 'Unable to connect to Flickr: error code: '. $error_code .' '. $error_msg, WATCHDOG_ERROR);
     return;
   }
+
   if (!$baseurl = $f->urls_getUserPhotos($person['id'])) {
     watchdog('activitystream', 'Unable to connect to Flickr: error code: '. $error_code .' '. $error_msg, WATCHDOG_ERROR);
     return;
   }
-  if (!$photos = $f->people_getPublicPhotos($person['id'], NULL, NULL, 10)) {
-    watchdog('activitystream', 'Unable to get photos from Flickr: error code: '. $error_code .' '. $error_msg, WATCHDOG_ERROR);
+
+  $feeds = variable_get('activitystream_flickr_import_default',_activitystream_flickr_import_defaults()) ;
+
+  if ( $feeds[1] == 1 ) {
+    if (!$photos = $f->people_getPublicPhotos($person['id'], NULL, NULL, 10)) {
+      watchdog('activitystream', 'Unable to get photos from Flickr: error code: '. $error_code .' '. $error_msg, WATCHDOG_ERROR);
+    }
+    $photoitems = activitystream_flickr_build_items($photos, 'photo', $f);
+  }
+  else {
+    $photoitems = array() ;
+  }
+
+  if ( $feeds[2] == 2 ) {
+    if (!$favorites = $f->favorites_getPublicList($person['id'], NULL, NULL, NULL, 10)) {
+      watchdog('activitystream', 'Unable to get Favorites Flickr: error code: '. $error_code .' '. $error_msg, WATCHDOG_ERROR);
+    }
+    $favoriteitems = activitystream_flickr_build_items($favorites, 'favorite', $f);
   }
-  if (!$favorites = $f->favorites_getPublicList($person['id'], NULL, NULL, NULL, 10)) {
-    watchdog('activitystream', 'Unable to get Faorites Flickr: error code: '. $error_code .' '. $error_msg, WATCHDOG_ERROR);
+  else {
+    $favoriteitems = array() ;
   }
-  
-  $photoitems = activitystream_flickr_build_items($photos, 'photo', $f);
-  $favoriteitems = activitystream_flickr_build_items($favorites, 'favorite', $f);
+
   $items = array_merge($photoitems, $favoriteitems);
 
   return $items;
@@ -92,9 +107,30 @@ function activitystream_flickr_activitys
     '#default_value' => variable_get('activitystream_flickr_key', ''),
     '#required' => FALSE
   );
+  $form['activitystream_flickr']['activitystream_flickr_import_default'] = array(
+    '#type' => 'checkboxes',
+    '#title' => t('Default import settings'),
+    '#options' => _activitystream_flickr_import_options(),
+    '#default_value' => variable_get('activitystream_flickr_import_default',_activitystream_flickr_import_defaults()),
+    '#description' => t('Which items to import.'),
+  );
   return $form;
 }
 
+function _activitystream_flickr_import_options() {
+  $options = array( 
+    1 => 'Import Uploaded Photos',
+    2 => 'Import Favourite Photos',
+  ) ;
+  return $options ;
+}
+
+function _activitystream_flickr_import_defaults() {
+  foreach( _activitystream_flickr_import_options() as $k => $v ) {
+    $defaults[] = $k ;
+  }
+  return $defaults ;
+}
 /*
  * Implement a user settings form hook. Modules should build a form
  * using an array that mirrors the Drupal form API. activitystream.module