Index: modules/friendlist_activity/friendlist_activity.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/heartbeat/modules/friendlist_activity/Attic/friendlist_activity.info,v
retrieving revision 1.1.2.2.2.1
diff -u -p -r1.1.2.2.2.1 friendlist_activity.info
--- modules/friendlist_activity/friendlist_activity.info	12 Jul 2009 23:09:57 -0000	1.1.2.2.2.1
+++ modules/friendlist_activity/friendlist_activity.info	13 Jan 2010 18:03:54 -0000
@@ -4,7 +4,5 @@ project = Heartbeat
 name = friendlist activity
 description = Logs activity when a friendlist event occurs. Integration module for all modules that defined rules/events with Rules ui.
 dependencies[] = heartbeat
-dependencies[] = friendlist_api
-dependencies[] = friendlist_rules
 core = 6.x
 version = 6.x-1.0
\ No newline at end of file
Index: modules/friendlist_activity/friendlist_activity.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/heartbeat/modules/friendlist_activity/Attic/friendlist_activity.module,v
retrieving revision 1.1.2.2.2.9
diff -u -p -r1.1.2.2.2.9 friendlist_activity.module
--- modules/friendlist_activity/friendlist_activity.module	24 Oct 2009 21:15:14 -0000	1.1.2.2.2.9
+++ modules/friendlist_activity/friendlist_activity.module	13 Jan 2010 18:03:54 -0000
@@ -83,7 +83,46 @@ function friendlist_activity_heartbeat_r
  *  Implementation of hook_form_alter().
  */
 function friendlist_activity_form_alter(&$form, $form_state, $form_id) {
-  if($form_id == 'heartbeat_activity_admin_settings') {
+  if ($form_id == 'heartbeat_activity_stream_configure' && $form['fs_settings']['access_type']['#value'] == 'connectedheartbeat') {
+    if (!isset($form['settings'])) {
+      $form['settings'] = array(
+        '#type' => 'fieldset',
+        '#weight' => 0,
+        '#title' => t('Friendlist settings'),
+        '#collapsible' => TRUE,
+        '#collapsed' => FALSE,
+      );
+    }
+    $access_type = heartbeat_stream_load('connectedheartbeat');
+    $value = $access_type['settings']['heartbeat_friendlist_activity_api'] ? $access_type['settings']['heartbeat_friendlist_activity_api'] : '';
+    $possible_options = array(
+      // OPTION    => array(TITLE, DEPENDENCIES ARRAY)
+      'friendlist' => array('Friendlist API', array('friendlist_api')), 
+      'ur'         => array('User Relationships', array('user_relationships_api')),
+    );
+    $options = array();
+    foreach ($possible_options as $option => $data) {
+      $can = TRUE;
+      foreach ($data[1] as $dependency) {
+        if (!module_exists($dependency)) {
+          $can = FALSE;
+          break;
+        }
+      }
+      if ($can) {
+        $options[$option] = $data[0];
+        if (empty($value)) {
+          $value = $option;
+        }
+      }
+    }
+    $form['settings']['heartbeat_friendlist_activity_api'] = array(
+      '#title' => t('API to use'),
+      '#type' => 'select',
+      '#options' => $options,
+      '#default_value' => $value,
+    );
+  } elseif ($form_id == 'heartbeat_activity_admin_settings') {
     $form['fl_fields'] = array(
       '#type' => 'fieldset',
       '#weight' => 0,
@@ -105,12 +144,21 @@ function friendlist_activity_form_alter(
 function friendlist_activity_get_friends($uid) {
   $uids = array();
   if(variable_get('heartbeat_add_friends_to_personal', TRUE)) {
-    $sql = "SELECT fr.requestee_id as 'uid' FROM {friendlist_relations} as fr
-      INNER JOIN {friendlist_statuses} fs ON fs.rid = fr.rid
-      WHERE fr.requester_id = %d AND fs.status = '%s' ORDER BY fs.last_update_time DESC, fr.rid DESC";
-    $result = db_query($sql, $uid, 'TW_BOTH');
-    while($row = db_fetch_object($result)) {
-      $uids[] = $row->uid;
+    $access_type = heartbeat_stream_load('connectedheartbeat');
+    $api = $access_type['settings']['heartbeat_friendlist_activity_api'] ? $access_type['settings']['heartbeat_friendlist_activity_api'] : '';
+    if ($api == 'friendlist') {
+      $sql = "SELECT fr.requestee_id as 'uid' FROM {friendlist_relations} as fr
+        INNER JOIN {friendlist_statuses} fs ON fs.rid = fr.rid
+        WHERE fr.requester_id = %d AND fs.status = '%s' ORDER BY fs.last_update_time DESC, fr.rid DESC";
+      $result = db_query($sql, $uid, 'TW_BOTH');
+      while($row = db_fetch_object($result)) {
+        $uids[] = $row->uid;
+      }
+    } elseif ($api == 'ur') { // User Relationships
+      $result = user_relationships_load(array("user" => $uid));
+      foreach ($result as $row) {
+        $uids[] = $row->requestee_id;
+      }
     }
   }
   return $uids;