Index: facebook_status.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/facebook_status.module,v
retrieving revision 1.5.6.141.2.9
diff -u -p -r1.5.6.141.2.9 facebook_status.module
--- facebook_status.module	16 Jan 2011 21:52:04 -0000	1.5.6.141.2.9
+++ facebook_status.module	17 Jan 2011 01:20:39 -0000
@@ -1026,7 +1026,7 @@ function facebook_status_token_values($t
 function facebook_status_views_api() {
   return array(
     'api' => 2,
-    'path' => drupal_get_path('module', 'facebook_status') .'/includes/views',
+    'path' => drupal_get_path('module', 'facebook_status') .'/includes/views', 
   );
 }
 
Index: includes/views/facebook_status.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/Attic/facebook_status.views.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 facebook_status.views.inc
--- includes/views/facebook_status.views.inc	16 Jan 2011 21:52:04 -0000	1.1.2.2
+++ includes/views/facebook_status.views.inc	17 Jan 2011 01:20:39 -0000
@@ -15,13 +15,13 @@ function facebook_status_views_data() {
   $data['facebook_status']['table']['join'] = array(
     'users' => array(
       'left_field' => 'uid',
-      'field' => 'uid',
+      'field' => 'recipient',
       'type' => 'INNER',
     ),
   );
   $data['users']['table']['join'] = array(
     'facebook_status' => array(
-      'left_field' => 'uid',
+      'left_field' => 'recipient',
       'field' => 'uid',
       'type' => 'INNER',
     ),
@@ -109,7 +109,7 @@ function facebook_status_views_data() {
   );
 
   //Declares the Owner UID column.
-  $data['facebook_status']['uid'] = array(
+  $data['facebook_status']['recipient'] = array(
     'title' => t('User ID'),
     'help' => t('The User ID of the owner of the status (if the status is from one user to another, this is the recipient).'),
     'field' => array(
@@ -128,7 +128,7 @@ function facebook_status_views_data() {
   );
 
   //Declares the Poster UID column.
-  $data['facebook_status']['pid'] = array(
+  $data['facebook_status']['sender'] = array(
     'title' => t('Poster UID'),
     'help' => t('The User ID of the poster of the status.'),
     'field' => array(
@@ -147,64 +147,64 @@ function facebook_status_views_data() {
   );
 
   //Alias for Poster UID to use the name.
-  $data['facebook_status']['pid_name'] = array(
+  $data['facebook_status']['sender_name'] = array(
     'title' => t('Poster Name'),
     'help' => t('The name of the user who posted the status.'),
     'field' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'facebook_status_views_handler_field_poster',
       'click sortable' => FALSE,
     ),
     'filter' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'views_handler_filter_user_name',
     ),
     'sort' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'views_handler_sort',
     ),
     'argument' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'views_handler_argument_user_uid',
     ),
   );
   //Alias for poster picture.
-  $data['facebook_status']['pid_pic'] = array(
+  $data['facebook_status']['sender_pic'] = array(
     'title' => t('Poster picture'),
     'help' => t('The picture of the user who posted the status.'),
     'field' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'facebook_status_views_handler_field_poster_pic',
       'click sortable' => FALSE,
     ),
   );
 
   //Alias for extras for the poster.
-  $data['facebook_status']['pid_extra'] = array(
+  $data['facebook_status']['sender_extra'] = array(
     'title' => t('Usernames (context-aware)'),
     'help' => t('The themed username(s) of either the owner or the sender and recipient of the status, depending on the context.'),
     'field' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'facebook_status_views_handler_field_cross',
       'click sortable' => FALSE,
       'label' => t('Users'),
     ),
   );
-  $data['facebook_status']['pid_extra_2'] = array(
+  $data['facebook_status']['sender_extra_2'] = array(
     'title' => t('Not own statuses'),
     'help' => t("Do not show statuses posted to one's own profile."),
     'filter' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'facebook_status_views_handler_filter_not_own',
       'label' => t("Restrict to others' statuses"),
     ),
   );
-  //This is slightly different than, but could probably be combined with, pid_extra_2.
-  $data['facebook_status']['pid_extra_3'] = array(
+  //This is slightly different than, but could probably be combined with, sender_extra_2.
+  $data['facebook_status']['sender_extra_3'] = array(
     'title' => t('Only own statuses'),
     'help' => t("Only show statuses posted to one's own profile."),
     'filter' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'facebook_status_views_handler_filter_own',
       'label' => t('Restrict to own statuses'),
     ),
@@ -213,7 +213,7 @@ function facebook_status_views_data() {
     'title' => t('Users with Pictures'),
     'help' => t('The themed username(s) and pictures of either the owner or the sender and recipient of the status, depending on the context.'),
     'field' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'facebook_status_views_handler_field_cross_pic',
       'click sortable' => FALSE,
       'label' => t('Users with Pictures'),
@@ -223,7 +223,7 @@ function facebook_status_views_data() {
     'title' => t('Respond link'),
     'help' => t('Links to view the conversation or respond to it when appropriate.'),
     'field' => array(
-      'field' => 'pid',
+      'field' => 'sender',
       'handler' => 'facebook_status_views_handler_field_respond',
       'click sortable' => FALSE,
       'label' => t('Respond to conversation'),
@@ -231,7 +231,7 @@ function facebook_status_views_data() {
   );
 
   //Declares the status message timestamp column.
-  $data['facebook_status']['status_time'] = array(
+  $data['facebook_status']['created'] = array(
     'title' => t('Created time'),
     'help' => t('The time the status message was posted.'),
     'field' => array(
@@ -247,11 +247,11 @@ function facebook_status_views_data() {
   );
 
   //Declares the status text column.
-  $data['facebook_status']['status'] = array(
+  $data['facebook_status']['message'] = array(
     'title' => t('Status text'),
     'help' => t('The text of the status update.'),
     'field' => array(
-      'handler' => 'facebook_status_views_handler_field_status',
+      'handler' => 'facebook_status_views_handler_field_message',
       'click sortable' => TRUE,
     ),
     'filter' => array(
@@ -263,7 +263,7 @@ function facebook_status_views_data() {
     'title' => t('Poster picture'),
     'help' => t("The picture of the user who took action (normally the same as Users: Picture, but shows the poster's picture for status messages)."),
     'field' => array(
-      'field' => 'uid',
+      'field' => 'recpient',
       'handler' => 'facebook_status_views_handler_field_poster_pic_activity',
       'click sortable' => FALSE,
     ),
@@ -273,14 +273,14 @@ function facebook_status_views_data() {
     $data['facebook_status']['user-flag-plus-current'] = array(
       'title' => t('Content from flagged users or the current user'),
       'filter' => array(
-        'field' => 'pid',
+        'field' => 'sender',
         'handler' => 'facebook_status_views_handler_filter_flagged_user',
       ),
     );
     $data['facebook_status']['user-flag-plus-arg'] = array(
       'title' => t('Content from flagged users or the argument user'),
       'argument' => array(
-        'field' => 'pid',
+        'field' => 'sender',
         'handler' => 'facebook_status_views_handler_argument_flagged_user',
       ),
     );
@@ -331,7 +331,7 @@ function facebook_status_views_handlers(
       'facebook_status_views_handler_field_respond' => array(
         'parent' => 'views_handler_field',
       ),
-      'facebook_status_views_handler_field_status' => array(
+      'facebook_status_views_handler_field_message' => array(
         'parent' => 'views_handler_field',
       ),
       'facebook_status_views_handler_filter' => array(
@@ -370,4 +370,4 @@ function facebook_status_views_plugins()
       ),
     )
   );
-}
\ No newline at end of file
+}
Index: includes/views/facebook_status.views_default.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/Attic/facebook_status.views_default.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status.views_default.inc
--- includes/views/facebook_status.views_default.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/facebook_status.views_default.inc	17 Jan 2011 01:20:39 -0000
@@ -95,7 +95,7 @@ function facebook_status_views_default_v
       'field' => 'respond',
       'relationship' => 'none',
     ),
-    'pid_extra' => array(
+    'sender_extra' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 0,
@@ -114,12 +114,12 @@ function facebook_status_views_default_v
         'html' => 0,
       ),
       'exclude' => 1,
-      'id' => 'pid_extra',
+      'id' => 'sender_extra',
       'table' => 'facebook_status',
-      'field' => 'pid_extra',
+      'field' => 'sender_extra',
       'relationship' => 'none',
     ),
-    'status' => array(
+    'message' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 0,
@@ -138,19 +138,19 @@ function facebook_status_views_default_v
         'html' => 0,
       ),
       'exclude' => 1,
-      'id' => 'status',
+      'id' => 'message',
       'table' => 'facebook_status',
-      'field' => 'status',
+      'field' => 'message',
       'relationship' => 'none',
       'override' => array(
         'button' => 'Override',
       ),
     ),
-    'status_time' => array(
+    'created' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 1,
-        'text' => '[pid_extra] [status] [status_time] [edit] [delete] [respond]',
+        'text' => '[sender_extra] [message] [created] [edit] [delete] [respond]',
         'make_link' => 0,
         'path' => '',
         'link_class' => '',
@@ -168,9 +168,9 @@ function facebook_status_views_default_v
       'date_format' => 'time ago',
       'custom_date_format' => '1',
       'exclude' => 0,
-      'id' => 'status_time',
+      'id' => 'created',
       'table' => 'facebook_status',
-      'field' => 'status_time',
+      'field' => 'created',
       'relationship' => 'none',
       'override' => array(
         'button' => 'Override',
@@ -178,11 +178,11 @@ function facebook_status_views_default_v
     ),
   ));
   $handler->override_option('sorts', array(
-    'status_time' => array(
+    'created' => array(
       'order' => 'DESC',
-      'id' => 'status_time',
+      'id' => 'created',
       'table' => 'facebook_status',
-      'field' => 'status_time',
+      'field' => 'created',
       'relationship' => 'none',
     ),
     'sid' => array(
@@ -270,11 +270,11 @@ function facebook_status_views_default_v
       $account = $account2;
     }
   }
-  return $return && user_access(\'edit own status\', $account) && !_facebook_status_exclude($account);',
+  return $return && user_access(\'edit own status\', $account) && facebook_status_user_access(\'view_stream\');',
     ),
   ));
   $handler->override_option('filters', array(
-    'status' => array(
+    'message' => array(
       'operator' => '!=',
       'value' => '',
       'group' => '0',
@@ -284,12 +284,12 @@ function facebook_status_views_default_v
         'label' => '',
       ),
       'case' => 1,
-      'id' => 'status',
+      'id' => 'message',
       'table' => 'facebook_status',
-      'field' => 'status',
+      'field' => 'message',
       'relationship' => 'none',
     ),
-    'pid_extra_3' => array(
+    'sender_extra_3' => array(
       'operator' => '=',
       'value' => '0',
       'group' => '0',
@@ -298,9 +298,9 @@ function facebook_status_views_default_v
         'operator' => FALSE,
         'label' => '',
       ),
-      'id' => 'pid_extra_3',
+      'id' => 'sender_extra_3',
       'table' => 'facebook_status',
-      'field' => 'pid_extra_3',
+      'field' => 'sender_extra_3',
       'relationship' => 'none',
     ),
   ));
@@ -365,7 +365,7 @@ function facebook_status_views_default_v
     'columns' => array(
       'name' => 'name',
       'uid' => 'uid',
-      'status' => 'status',
+      'message' => 'message',
     ),
     'info' => array(
       'name' => array(
@@ -376,7 +376,7 @@ function facebook_status_views_default_v
         'sortable' => 0,
         'separator' => '',
       ),
-      'status' => array(
+      'message' => array(
         'sortable' => 0,
         'separator' => '',
       ),
@@ -488,7 +488,7 @@ function facebook_status_views_default_v
       'field' => 'respond',
       'relationship' => 'none',
     ),
-    'pid_extra' => array(
+    'sender_extra' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 0,
@@ -507,12 +507,12 @@ function facebook_status_views_default_v
         'html' => 0,
       ),
       'exclude' => 1,
-      'id' => 'pid_extra',
+      'id' => 'sender_extra',
       'table' => 'facebook_status',
-      'field' => 'pid_extra',
+      'field' => 'sender_extra',
       'relationship' => 'none',
     ),
-    'status' => array(
+    'message' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 0,
@@ -531,16 +531,16 @@ function facebook_status_views_default_v
         'html' => 0,
       ),
       'exclude' => 1,
-      'id' => 'status',
+      'id' => 'message',
       'table' => 'facebook_status',
-      'field' => 'status',
+      'field' => 'message',
       'relationship' => 'none',
     ),
-    'status_time' => array(
+    'created' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 1,
-        'text' => '[pid_extra] [status] [status_time] [edit] [delete] [respond]',
+        'text' => '[sender_extra] [message] [created] [edit] [delete] [respond]',
         'make_link' => 0,
         'path' => '',
         'link_class' => '',
@@ -558,18 +558,18 @@ function facebook_status_views_default_v
       'date_format' => 'time ago',
       'custom_date_format' => '1',
       'exclude' => 0,
-      'id' => 'status_time',
+      'id' => 'created',
       'table' => 'facebook_status',
-      'field' => 'status_time',
+      'field' => 'created',
       'relationship' => 'none',
     ),
   ));
   $handler->override_option('sorts', array(
-    'status_time' => array(
+    'createde' => array(
       'order' => 'DESC',
-      'id' => 'status_time',
+      'id' => 'created',
       'table' => 'facebook_status',
-      'field' => 'status_time',
+      'field' => 'created',
       'relationship' => 'none',
     ),
     'sid' => array(
@@ -595,7 +595,7 @@ function facebook_status_views_default_v
       'field' => 'sid_extra',
       'relationship' => 'none',
     ),
-    'pid_extra_3' => array(
+    'sender_extra_3' => array(
       'operator' => '=',
       'value' => '0',
       'group' => '0',
@@ -604,12 +604,12 @@ function facebook_status_views_default_v
         'operator' => FALSE,
         'label' => '',
       ),
-      'id' => 'pid_extra_3',
+      'id' => 'sender_extra_3',
       'table' => 'facebook_status',
-      'field' => 'pid_extra_3',
+      'field' => 'sender_extra_3',
       'relationship' => 'none',
     ),
-    'status' => array(
+    'message' => array(
       'operator' => '!=',
       'value' => '',
       'group' => '0',
@@ -619,9 +619,9 @@ function facebook_status_views_default_v
         'label' => '',
       ),
       'case' => 1,
-      'id' => 'status',
+      'id' => 'message',
       'table' => 'facebook_status',
-      'field' => 'status',
+      'field' => 'message',
       'relationship' => 'none',
     ),
   ));
@@ -645,19 +645,19 @@ function facebook_status_views_default_v
     'order' => 'asc',
     'columns' => array(
       'name' => 'name',
-      'status' => 'status',
-      'status_time' => 'status_time',
+      'message' => 'message',
+      'created' => 'created',
     ),
     'info' => array(
       'name' => array(
         'sortable' => 0,
         'separator' => '',
       ),
-      'status' => array(
+      'message' => array(
         'sortable' => 0,
         'separator' => '',
       ),
-      'status_time' => array(
+      'created' => array(
         'sortable' => 0,
         'separator' => '',
       ),
@@ -723,7 +723,7 @@ function facebook_status_views_default_v
   $view->disabled = FALSE;
   $handler = $view->new_display('default', 'Conversation', 'default');
   $handler->override_option('fields', array(
-    'pid_name' => array(
+    'sender_name' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 0,
@@ -743,12 +743,12 @@ function facebook_status_views_default_v
       ),
       'link_to_user' => 1,
       'exclude' => 1,
-      'id' => 'pid_name',
+      'id' => 'sender_name',
       'table' => 'facebook_status',
-      'field' => 'pid_name',
+      'field' => 'sender_name',
       'relationship' => 'none',
     ),
-    'status' => array(
+    'message' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 0,
@@ -767,9 +767,9 @@ function facebook_status_views_default_v
         'html' => 0,
       ),
       'exclude' => 1,
-      'id' => 'status',
+      'id' => 'message',
       'table' => 'facebook_status',
-      'field' => 'status',
+      'field' => 'message',
       'relationship' => 'none',
     ),
     'edit' => array(
@@ -822,11 +822,11 @@ function facebook_status_views_default_v
       'field' => 'delete',
       'relationship' => 'none',
     ),
-    'status_time' => array(
+    'created' => array(
       'label' => '',
       'alter' => array(
         'alter_text' => 1,
-        'text' => '[pid_name] [status] [status_time] [edit] [delete]',
+        'text' => '[sender_name] [message] [created] [edit] [delete]',
         'make_link' => 0,
         'path' => '',
         'alt' => '',
@@ -843,18 +843,18 @@ function facebook_status_views_default_v
       'date_format' => 'time ago',
       'custom_date_format' => '1',
       'exclude' => 0,
-      'id' => 'status_time',
+      'id' => 'created',
       'table' => 'facebook_status',
-      'field' => 'status_time',
+      'field' => 'created',
       'relationship' => 'none',
     ),
   ));
   $handler->override_option('sorts', array(
-    'status_time' => array(
+    'created' => array(
       'order' => 'DESC',
-      'id' => 'status_time',
+      'id' => 'created',
       'table' => 'facebook_status',
-      'field' => 'status_time',
+      'field' => 'created',
       'relationship' => 'none',
     ),
     'sid' => array(
@@ -940,7 +940,7 @@ function facebook_status_views_default_v
       }
       return FALSE;',
     ),
-    'pid' => array(
+    'sender' => array(
       'default_action' => 'default',
       'style_plugin' => 'default_summary',
       'style_options' => array(),
@@ -953,9 +953,9 @@ function facebook_status_views_default_v
       'validate_fail' => 'not found',
       'break_phrase' => 1,
       'not' => 0,
-      'id' => 'pid',
+      'id' => 'sender',
       'table' => 'facebook_status',
-      'field' => 'pid',
+      'field' => 'sender',
       'validate_user_argument_type' => 'uid',
       'validate_user_roles' => array(
         '2' => 0,
@@ -1023,7 +1023,7 @@ function facebook_status_views_default_v
     ),
   ));
   $handler->override_option('filters', array(
-    'pid_extra_2' => array(
+    'sender_extra_2' => array(
       'operator' => '=',
       'value' => '1',
       'group' => '0',
@@ -1032,9 +1032,9 @@ function facebook_status_views_default_v
         'operator' => FALSE,
         'label' => '',
       ),
-      'id' => 'pid_extra_2',
+      'id' => 'sender_extra_2',
       'table' => 'facebook_status',
-      'field' => 'pid_extra_2',
+      'field' => 'sender_extra_2',
       'relationship' => 'none',
     ),
   ));
@@ -1055,19 +1055,19 @@ function facebook_status_views_default_v
     'order' => 'asc',
     'columns' => array(
       'name' => 'name',
-      'status' => 'status',
-      'status_time' => 'status_time',
+      'message' => 'message',
+      'created' => 'created',
     ),
     'info' => array(
       'name' => array(
         'sortable' => 0,
         'separator' => '',
       ),
-      'status' => array(
+      'message' => array(
         'sortable' => 0,
         'separator' => '',
       ),
-      'status_time' => array(
+      'created' => array(
         'sortable' => 0,
         'separator' => '',
       ),
@@ -1092,4 +1092,4 @@ function facebook_status_views_default_v
   $views[$view->name] = $view;
 
   return $views;
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_field_cross.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_field_cross.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_field_cross.inc
--- includes/views/handlers/facebook_status_views_handler_field_cross.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_field_cross.inc	17 Jan 2011 01:20:39 -0000
@@ -13,10 +13,10 @@
 class facebook_status_views_handler_field_cross extends views_handler_field {
   function construct() {
     parent::construct();
-    $this->additional_fields['uid'] = 'uid';
+    $this->additional_fields['recipient'] = 'recipient';
   }
   function render($values) {
-    $uid = $values->{$this->aliases['uid']};
+    $uid = $values->{$this->aliases['recipient']};
     $pid = $values->{$this->field_alias};
     if (isset($uid) && $pid == $uid) {
       return theme('username', _facebook_status_user_load($uid));
@@ -27,4 +27,4 @@ class facebook_status_views_handler_fiel
       return t('!poster » !owner', $args);
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_field_cross_pic.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_field_cross_pic.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_field_cross_pic.inc
--- includes/views/handlers/facebook_status_views_handler_field_cross_pic.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_field_cross_pic.inc	17 Jan 2011 01:20:39 -0000
@@ -41,10 +41,10 @@ class facebook_status_views_handler_fiel
   }
   function construct() {
     parent::construct();
-    $this->additional_fields['uid'] = 'uid';
+    $this->additional_fields['sender'] = 'sender';
   }
   function render($values) {
-    $uid = $values->{$this->aliases['uid']};
+    $uid = $values->{$this->aliases['recipient']};
     $pid = $values->{$this->field_alias};
     $options = $this->options;
     if (isset($uid) && $pid == $uid) {
@@ -67,4 +67,4 @@ class facebook_status_views_handler_fiel
       return t('!poster-picture !poster » !owner-picture !owner', $args);
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_field_delete.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_field_delete.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_field_delete.inc
--- includes/views/handlers/facebook_status_views_handler_field_delete.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_field_delete.inc	17 Jan 2011 01:20:39 -0000
@@ -12,16 +12,16 @@
 class facebook_status_views_handler_field_delete extends views_handler_field {
   function construct() {
     parent::construct();
-    $this->additional_fields['uid'] = 'uid';
-    $this->additional_fields['pid'] = 'pid';
+    $this->additional_fields['sender'] = 'sender';
+    $this->additional_fields['recipient'] = 'recipient';
   }
   function render($values) {
     $status = new stdClass();
-    $status->uid = $values->{$this->aliases['uid']};
-    $status->pid = $values->{$this->aliases['pid']};
+    $status->sender = $values->{$this->aliases['sender']};
+    $status->recipient = $values->{$this->aliases['recipient']};
     $status->sid = $values->{$this->field_alias};
-    if (_facebook_status_can_edit($status, TRUE)) {
-      drupal_add_css(drupal_get_path('module', 'facebook_status') .'/facebook_status.css');
+    if (facebook_status_user_access_delete($status)) {
+      drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css');
       $q = $_GET['q'];
       if ($q == 'facebook_status/js') {
         $q = 'user';
@@ -29,4 +29,4 @@ class facebook_status_views_handler_fiel
       return '<span class="facebook_status_edit_delete">'. l(t('Delete'), 'statuses/'. $status->sid .'/delete', array('query' => array('destination' => $q))) .'</span>';
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_field_edit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_field_edit.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_field_edit.inc
--- includes/views/handlers/facebook_status_views_handler_field_edit.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_field_edit.inc	17 Jan 2011 01:20:39 -0000
@@ -12,16 +12,16 @@
 class facebook_status_views_handler_field_edit extends views_handler_field {
   function construct() {
     parent::construct();
-    $this->additional_fields['uid'] = 'uid';
-    $this->additional_fields['pid'] = 'pid';
+    $this->additional_fields['sender'] = 'sender';
+    $this->additional_fields['recipient'] = 'recipient';
   }
   function render($values) {
     $status = new stdClass();
-    $status->uid = $values->{$this->aliases['uid']};
-    $status->pid = $values->{$this->aliases['pid']};
+    $status->sender = $values->{$this->aliases['sender']};
+    $status->recipient = $values->{$this->aliases['recipient']};
     $status->sid = $values->{$this->field_alias};
-    if (_facebook_status_can_edit($status)) {
-      drupal_add_css(drupal_get_path('module', 'facebook_status') .'/facebook_status.css');
+    if (facebook_status_user_access_edit($status)) {
+      drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css');
       $q = $_GET['q'];
       if ($q == 'facebook_status/js') {
         $q = 'user';
@@ -29,4 +29,4 @@ class facebook_status_views_handler_fiel
       return '<span class="facebook_status_edit_delete">'. l(t('Edit'), 'statuses/'. $status->sid .'/edit', array('query' => array('destination' => $q))) .'</span>';
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_field_message.inc
===================================================================
RCS file: includes/views/handlers/facebook_status_views_handler_field_message.inc
diff -N includes/views/handlers/facebook_status_views_handler_field_message.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ includes/views/handlers/facebook_status_views_handler_field_message.inc	17 Jan 2011 01:20:39 -0000
@@ -0,0 +1,31 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ *   Formats statuses in Views.
+ */
+
+/**
+ * Field handler to provide the most recent status update.
+ */
+class facebook_status_views_handler_field_message extends views_handler_field {
+/*  function construct() {
+    parent::construct();
+    $this->additional_fields['sender'] = 'sender';
+    $this->additional_fields['recipient'] = 'recipient';
+    $this->additional_fields['sid'] = 'sid';
+    $this->additional_fields['created'] = 'created';
+  }*/
+  function render($values) {
+//    $status = new stdClass();
+//    $status->sender = $values->{$this->aliases['sender']};
+//    $status->recipient = $values->{$this->aliases['recipient']};
+//    $status->sid = $values->{$this->aliases['sid']};
+//    $status->message = $values->{$this->field_alias};
+//    $status->created = $values->{$this->aliases['created']};
+//    $components = facebook_status_item_components($status);
+//    return $components['status']['#value'];
+    return $values->{$this->field_alias};
+  }
+}
Index: includes/views/handlers/facebook_status_views_handler_field_poster_pic_activity.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_field_poster_pic_activity.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_field_poster_pic_activity.inc
--- includes/views/handlers/facebook_status_views_handler_field_poster_pic_activity.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_field_poster_pic_activity.inc	17 Jan 2011 01:20:39 -0000
@@ -50,7 +50,7 @@ class facebook_status_views_handler_fiel
     if ($values->{$this->aliases['type']} == 'facebook_status') {
       $sid = $values->{$this->aliases['eid']};
       $status = facebook_status_load($sid);
-      $account = _facebook_status_user_load($status->pid);
+      $account = _facebook_status_user_load($status->recipient);
     }
     else {
       $account = _facebook_status_user_load($values->{$this->field_alias});
@@ -61,4 +61,4 @@ class facebook_status_views_handler_fiel
     }
     return facebook_status_display_user_picture($account);
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_field_repost.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_field_repost.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_field_repost.inc
--- includes/views/handlers/facebook_status_views_handler_field_repost.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_field_repost.inc	17 Jan 2011 01:20:39 -0000
@@ -12,7 +12,7 @@
 class facebook_status_views_handler_field_repost extends views_handler_field {
   function construct() {
     parent::construct();
-    $this->additional_fields['pid'] = 'pid';
+    $this->additional_fields['recipient'] = 'recipient';
   }
   function option_definition() {
     $options = parent::option_definition();
@@ -32,8 +32,8 @@ class facebook_status_views_handler_fiel
     );
   }
   function render($values) {
-    if ((user_access('edit own status') || user_access('edit all statuses')) && $values->{$this->aliases['pid']} != $GLOBALS['user']->uid) {
-      drupal_add_css(drupal_get_path('module', 'facebook_status') .'/facebook_status.css');
+    if ((user_access('edit own status') || user_access('edit all statuses')) && $values->{$this->aliases['recipient']} != $GLOBALS['user']->uid) {
+      drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css');
       $options = array(
         'attributes' => array('class' => 'facebook_status_conversation_link'),
         'query' => array('sid' => $values->{$this->field_alias}, 'destination' => $_GET['q'])
@@ -41,4 +41,4 @@ class facebook_status_views_handler_fiel
       return l($this->options['repost_text'], 'share-status', $options);
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_field_respond.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_field_respond.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_field_respond.inc
--- includes/views/handlers/facebook_status_views_handler_field_respond.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_field_respond.inc	17 Jan 2011 01:20:39 -0000
@@ -12,14 +12,14 @@
 class facebook_status_views_handler_field_respond extends views_handler_field {
   function construct() {
     parent::construct();
-    $this->additional_fields['uid'] = 'uid';
+    $this->additional_fields['recipient'] = 'recipient';
     $this->additional_fields['sid'] = 'sid';
   }
   function render($values) {
     global $user;
-    $owner = _facebook_status_user_load($values->{$this->aliases['uid']});
+    $owner = _facebook_status_user_load($values->{$this->aliases['recipient']});
     $poster = _facebook_status_user_load($values->{$this->field_alias});
-    drupal_add_css(drupal_get_path('module', 'facebook_status') .'/facebook_status.css');
+    drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css');
     $options = array('attributes' => array('class' => 'facebook_status_conversation_link'));
     if ($owner->uid != $poster->uid && user_access('post on all profiles')) {
       $title = t('View conversation');
@@ -48,4 +48,4 @@ class facebook_status_views_handler_fiel
       return l(t('Respond'), 'statuses/conversation/'. check_plain($poster->name) .','. check_plain($user->name), $options);
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_filter.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_filter.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_filter.inc
--- includes/views/handlers/facebook_status_views_handler_filter.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_filter.inc	17 Jan 2011 01:20:39 -0000
@@ -20,8 +20,8 @@ class facebook_status_views_handler_filt
   function query() {
     if ($this->value) {
       $this->ensure_my_table();
-      $subquery = "(SELECT MAX(sid) FROM {facebook_status} WHERE uid = pid GROUP BY uid)";
+      $subquery = "(SELECT MAX(sid) FROM {facebook_status} WHERE sender = recipient GROUP BY sender)";
       $this->query->add_where(0, db_prefix_tables("$this->table_alias.sid IN $subquery"));
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_filter_flagged_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_filter_flagged_user.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_filter_flagged_user.inc
--- includes/views/handlers/facebook_status_views_handler_filter_flagged_user.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_filter_flagged_user.inc	17 Jan 2011 01:20:39 -0000
@@ -39,8 +39,8 @@ class facebook_status_views_handler_filt
     );
   }
   function query() {
-    $query = "({$this->table}.pid IN (SELECT content_id FROM {flag_content} WHERE fid = %d AND uid = %d) OR {$this->table}.pid = %d)";
+    $query = "({$this->table}.owner IN (SELECT content_id FROM {flag_content} WHERE fid = %d AND uid = %d) OR {$this->table}.owner = %d)";
     $query = db_prefix_tables($query);
     $this->query->add_where($this->options['group'], $query, $this->options['facebook_status_flag_type'], $GLOBALS['user']->uid, $GLOBALS['user']->uid);
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_filter_not_own.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_filter_not_own.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_filter_not_own.inc
--- includes/views/handlers/facebook_status_views_handler_filter_not_own.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_filter_not_own.inc	17 Jan 2011 01:20:39 -0000
@@ -20,7 +20,7 @@ class facebook_status_views_handler_filt
   function query() {
     if ($this->value) {
       $this->ensure_my_table();
-      $this->query->add_where(0, db_prefix_tables("$this->table_alias.uid <> $this->table_alias.pid"));
+      $this->query->add_where(0, db_prefix_tables("$this->table_alias.sender <> $this->table_alias.recipient"));
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_handler_filter_own.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_handler_filter_own.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_handler_filter_own.inc
--- includes/views/handlers/facebook_status_views_handler_filter_own.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_handler_filter_own.inc	17 Jan 2011 01:20:39 -0000
@@ -20,7 +20,7 @@ class facebook_status_views_handler_filt
   function query() {
     if ($this->value) {
       $this->ensure_my_table();
-      $this->query->add_where(0, db_prefix_tables("$this->table_alias.uid = $this->table_alias.pid"));
+      $this->query->add_where(0, db_prefix_tables("$this->table_alias.sender = $this->table_alias.recipient"));
     }
   }
-}
\ No newline at end of file
+}
Index: includes/views/handlers/facebook_status_views_plugin_row_rss.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/views/handlers/Attic/facebook_status_views_plugin_row_rss.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_views_plugin_row_rss.inc
--- includes/views/handlers/facebook_status_views_plugin_row_rss.inc	30 Nov 2010 07:20:45 -0000	1.1.2.1
+++ includes/views/handlers/facebook_status_views_plugin_row_rss.inc	17 Jan 2011 01:20:39 -0000
@@ -27,17 +27,17 @@ class facebook_status_views_plugin_row_r
     if (empty($status)) {
       return;
     }
-    $owner = _facebook_status_user_load($status->uid);
-    $poster = _facebook_status_user_load($status->pid);
+    $owner = _facebook_status_user_load($status->recipient);
+    $poster = _facebook_status_user_load($status->sender);
 
     $item = new stdClass();
-    $item->title = filter_xss($status->status);
+    $item->title = filter_xss($status->message);
     $item->link = url("statuses/$status->sid", array('absolute' => TRUE));
     $item->sid = $status->sid;
     $item->description = '';
 
     $item->elements = array(
-      array('key' => 'pubDate', 'value' => gmdate('r', $status->status_time)),
+      array('key' => 'pubDate', 'value' => gmdate('r', $status->created)),
       array(
         'key' => 'dc:creator',
         'value' => check_plain($poster->name),
@@ -58,4 +58,4 @@ class facebook_status_views_plugin_row_r
 
     return theme($this->theme_functions(), $this->view, $this->options, $item);
   }
-}
\ No newline at end of file
+}