--- fbsmp-orig/fbsmp.module	2011-12-28 02:28:12.000000000 -0600
+++ fbsmp.module	2012-01-22 11:43:02.000000000 -0600
@@ -33,7 +33,7 @@
  *    'trigger' => TRUE,
  *    'twitter' => FALSE,
  *    'userpoints' => TRUE,
- *    'facebook_status' => array(
+ *    'statuses' => array(
  *      'discard duplicates' => FALSE,
  *      'timed override' => FALSE,
  *      'discard blank statuses' => FALSE,
@@ -63,7 +63,7 @@
     'trigger' => TRUE,
     'twitter' => TRUE,
     'userpoints' => TRUE,
-    'facebook_status' => array(
+    'statuses' => array(
       'discard duplicates' => FALSE,
       'timed override' => FALSE,
       'discard blank statuses' => FALSE,
@@ -75,7 +75,7 @@
   drupal_alter('fbsmp_save_alerts', $alerts, $attach_type);
 
   //Save status in FBSS.
-  $status = statuses_save_status($recipient, $type, $status_text, $sender, $alerts['facebook_status']);
+  $status = statuses_save_status($recipient, $type, $status_text, $sender, $alerts['statuses']);
 
   $record = new stdClass();
   $record->type = $attach_type;
@@ -132,7 +132,7 @@
  *    'trigger' => TRUE,
  *    'twitter' => FALSE,
  *    'userpoints' => TRUE,
- *    'facebook_status' => array(
+ *    'statuses' => array(
  *      'discard duplicates' => FALSE,
  *      'timed override' => FALSE,
  *      'discard blank statuses' => FALSE,
@@ -142,7 +142,7 @@
  */
 function fbsmp_edit_status($status_old, $new_message, $new_attachment, $alerts) {
   if (!is_object($status_old)) {
-    $status_old = facebook_status_load($status_old);
+    $status_old = statuses_load($status_old);
   }
 
   // Merge default alerts.
@@ -152,7 +152,7 @@
     'trigger' => TRUE,
     'twitter' => TRUE,
     'userpoints' => TRUE,
-    'facebook_status' => array(
+    'statuses' => array(
       'discard duplicates' => FALSE,
       'timed override' => FALSE,
       'discard blank statuses' => FALSE,
@@ -160,7 +160,7 @@
     ),
   );
 
-  facebook_status_edit_status($status_old, $new_message, $alerts['facebook_status']);
+  statuses_edit_status($status_old, $new_message, $alerts['statuses']);
 
   if ($new_attachment->data !== FALSE) {
     drupal_write_record('fbsmp', $new_attachment, array('sid'));
@@ -198,8 +198,8 @@
  *   An attachment object containing sid, type and data.
  */
 function fbsmp_load($sid) {
-  $attachment = db_fetch_object(db_query("SELECT sid, type, data FROM {fbsmp}
-              WHERE sid = :sid", array(':sid' => $sid)));
+  $attachment = db_query("SELECT sid, type, data FROM {fbsmp}
+              WHERE sid = :sid", array(':sid' => $sid))->fetchObject();
   if ($attachment) {
     $attachment->data = unserialize($attachment->data);
   }
@@ -272,7 +272,7 @@
     'rules' => TRUE,
     'trigger' => TRUE,
     'userpoints' => TRUE,
-    'facebook_status' => array(
+    'statuses' => array(
       'has attachment' => TRUE,  //Disables alerts to other modules sent by FBSS.
     ),
   );
@@ -300,7 +300,7 @@
   }
   
   //Delete the status from Statuses
-  statuses_delete_status($sid, $alerts['facebook_status']);
+  statuses_delete_status($sid, $alerts['statuses']);
   
   db_delete('fbsmp')
   ->condition('sid', $sid)
@@ -310,7 +310,7 @@
   if (module_exists('activity') && function_exists('activity_help') && $alerts['activity2']) {
     $result = db_query("SELECT aid FROM {activity} WHERE type = :type AND eid = :eid", array(':type' => 'fbsmp', ':eid' => $sid));
     $records = array();
-    while ($record = db_fetch_object($result)) {
+    while ($record = $result->fetchObject()) {
       $records[] = $record->aid;
     }
     if (!empty($records)) {
@@ -393,7 +393,7 @@
       'trigger' => FALSE,
       'userpoints' => FALSE,
     );
-    while ($attachment = db_fetch_array($results)) {
+    while ($attachment = $results->fetchAssoc()) {
       fbsmp_delete_status($attachment['sid'], $alerts);
     }
   }
@@ -440,7 +440,7 @@
   if ($attachment_type) {
     $results = db_query("SELECT * FROM {fbsmp} WHERE type = :type", array(':type' => $attachment_type));
     $records = array();
-    while ($record = db_fetch_array($results)) {
+    while ($record = $results->fetchAssoc()) {
       $record['data'] = unserialize($record['data']);
       $records[] = $record;
     }
@@ -550,7 +550,7 @@
   $plugins = fbsmp_get_plugins();
   $hooks = array();
 
-  $contexts = facebook_status_all_contexts();
+  $contexts = statuses_all_contexts();
   if ($context_type != FALSE) {
     $contexts = array_intersect_key($contexts, array($context_type => $context_type));
   }
@@ -589,7 +589,7 @@
  *   TRUE if the current user can edit or delete the status; FALSE otherwise.
  */
 function _fbsmp_status_can_edit($status, $delete = FALSE) {
-  return facebook_status_user_access($delete ? 'delete' : 'edit', $status);
+  return statuses_user_access($delete ? 'delete' : 'edit', $status);
 }
 
 /**
@@ -602,7 +602,7 @@
  *   TRUE if the current user can view the status; FALSE otherwise.
  */
 function fbsmp_status_can_view($status) {
-  return facebook_status_user_access('view', $status);
+  return statuses_user_access('view', $status);
 }
 
 /**
@@ -798,10 +798,10 @@
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function fbsmp_form__facebook_status_delete_alter(&$form, &$form_state) {
+function fbsmp_form__statuses_delete_alter(&$form, &$form_state) {
   $attachment = fbsmp_load($form['status-sid']['#value']);
   if ($attachment) {
-    $key = array_search('_facebook_status_delete_confirm', $form['confirm']['#submit']);
+    $key = array_search('_statuses_delete_confirm', $form['confirm']['#submit']);
     unset($form['confirm']['#submit'][$key]);
     $form['confirm']['#submit'][] = 'fbsmp_delete_confirm';
   }
@@ -827,7 +827,7 @@
 /**
  * Implements hook_form_FORM_ID_alter().
  */
-function fbsmp_form_facebook_status_edit_alter(&$form, &$form_state) {
+function fbsmp_form_statuses_edit_alter(&$form, &$form_state) {
   if ($attachment = fbsmp_load($form['sid']['#value'])) {
     if ($function = fbsmp_load_function($attachment->type, 'edit_form')) {
 
@@ -854,7 +854,7 @@
 
       $form['#validate'][] = 'fbsmp_edit_status_validate';
 
-      $key = array_search('facebook_status_edit_submit', $form['#submit']);
+      $key = array_search('statuses_edit_submit', $form['#submit']);
       unset($form['#submit'][$key]);
       $form['#submit'][] = 'fbsmp_edit_status_submit';
     }
@@ -888,7 +888,7 @@
   if ($function) {
     $attachment_data = $function($attachment, $form, $form_state);
   }
-  $status_old = facebook_status_load($form_state['values']['sid']);
+  $status_old = statuses_load($form_state['values']['sid']);
   $account = user_load($status_old->uid);
   $new_status_text = trim($form_state['values']['fbss-status']);
 
@@ -905,9 +905,9 @@
 }
 
 /**
- * Implements hook_preprocess_facebook_status_item().
+ * Implements hook_preprocess_statuses_item().
  */
-function fbsmp_preprocess_facebook_status_item(&$vars) {
+function fbsmp_preprocess_statuses_item(&$vars) {
   $attachment = fbsmp_load($vars['status']->sid);
 
   if ($attachment) {
@@ -1048,7 +1048,7 @@
     $form['fbss-submit']['#submit'][] = 'fbsmp_' . $form_load . '_submit';
 
     if (module_exists('fbss_twitter')) {
-      $key = array_search('fbss_twitter_facebook_status_box_submit', $form['fbss-submit']['#submit']);
+      $key = array_search('fbss_twitter_statuses_box_submit', $form['fbss-submit']['#submit']);
       unset($form['fbss-submit']['#submit'][$key]);
     }
 
@@ -1205,7 +1205,7 @@
 }
 
 /**
- * Implements hook_facebook_status_form_ahah_alter().
+ * Implements hook_statuses_form_ahah_alter().
  */
 function fbsmp_statuses_form_ahah_alter(&$new_form, $form) {
   $new_form['fbsmp'] = $form['fbsmp'];
@@ -1343,7 +1343,7 @@
   foreach ($plugins as $key => $info) {
     $name = isset($info['name']) ? $info['name'] : $key;
     $temp = 'fbsmp_' . $key;
-    foreach (facebook_status_all_contexts() as $type => $details) {
+    foreach (statuses_all_contexts() as $type => $details) {
       if ($type == 'user') {
         $triggers[$temp . '_submitted_user_self'] = array(
           'runs when' => t('A user has posted a !pluginobject on their own profile.', array('!pluginobject' => $name)),
@@ -1407,7 +1407,7 @@
   $context = array(
     'hook' => 'fbsmp',
     'op' => $op,
-    'facebook_status' => $status,
+    'statuses' => $status,
     'fbsmp' => $attachment,
   );
 
@@ -1431,7 +1431,7 @@
   $info->name        = 'fbsmp';
   $info->object_type = 'fbsmp';
   $info->eid_field   = 'sid';
-  $info->objects     = array('Recipient' => 'facebook_status', 'Sender' => 'fbsmp');
+  $info->objects     = array('Recipient' => 'statuses', 'Sender' => 'fbsmp');
   $info->hooks       = array('fbsmp' => $hooks);
   return $info;
 }