Index: activity.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activity/Attic/activity.admin.inc,v
retrieving revision 1.1.2.32
diff -u -p -r1.1.2.32 activity.admin.inc
--- activity.admin.inc	21 Jan 2010 18:13:40 -0000	1.1.2.32
+++ activity.admin.inc	24 Jan 2010 03:54:13 -0000
@@ -508,7 +508,7 @@ function activity_settings_form(&$form_s
     '#title' => t('Realms'),
     '#description' => t('Select the realms for which Activity access records should be recorded. These realms will allow a View to filter in more then just one users Activity.'),
     '#options' => $realms,
-    '#default_value' => variable_get('activity_access_realms', array('comment')),
+    '#default_value' => variable_get('activity_access_realms', array('comment', 'activity_actor')),
   );
 
   $form['activity_access']['activity_access_rebuild'] = array(
Index: activity.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activity/activity.module,v
retrieving revision 1.1.2.2.2.30.2.31.2.71
diff -u -p -r1.1.2.2.2.30.2.31.2.71 activity.module
--- activity.module	21 Jan 2010 23:59:49 -0000	1.1.2.2.2.30.2.31.2.71
+++ activity.module	24 Jan 2010 03:54:13 -0000
@@ -66,6 +66,13 @@ function _activity_activity_info() {
   return $info;
 }
 
+function activity_activity_info() {
+  $info = _activity_activity_info();
+  $info->name = 'activity';
+  $info->realms = array('activity_actor' => 'Activity Actor');
+  return $info;
+}
+
 function comment_activity_info() {
   $info = _activity_activity_info();
   $info->name = 'comment';
Index: modules/activity.activity.inc
===================================================================
RCS file: modules/activity.activity.inc
diff -N modules/activity.activity.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ modules/activity.activity.inc	24 Jan 2010 03:54:13 -0000
@@ -0,0 +1,35 @@
+<?php
+// $Id: $
+/**
+ * @file:
+ * Provides Activity2 hooks for itself.
+ */
+
+/**
+ * Implementation of hook_activity_grants().
+ */
+function activity_activity_grants($activity) {
+  $grants = array();
+
+  // Just in case uid 0 can do Activities.
+  if (!empty($activity->uid)) {
+    $grants = array(
+      'activity_actor' => array(
+        $activity->uid
+      ),
+    );
+  }
+
+  return $grants;
+}
+
+/**
+ * Implementation of hook_activity_access_grants().
+ */
+function activity_activity_access_grants($account) {
+  return array(
+    'activity_actor' => array(
+      $account->uid
+    ),
+  );
+}
\ No newline at end of file
Index: views/activity.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activity/views/Attic/activity.views.inc,v
retrieving revision 1.1.2.20
diff -u -p -r1.1.2.20 activity.views.inc
--- views/activity.views.inc	2 Dec 2009 00:17:41 -0000	1.1.2.20
+++ views/activity.views.inc	24 Jan 2010 03:54:13 -0000
@@ -38,15 +38,6 @@ function activity_views_data() {
       'handler' => 'views_handler_sort',
     ),
   );
-  $data['activity']['access_uid'] = array(
-    'title' => t('Allow Access to the Actor'),
-    'help' => t('Allow the actor to see their own activity'),
-    'group' => t('Activity Access'),
-    'filter' => array(
-      'handler' => 'activity_views_handler_filter_uid_access',
-      'field' => 'uid',
-    ),
-  );
   // Views doesn't allow for a field of op. It is used elsewhere by Views
   $data['activity']['operation'] = array(
     'title' => t('Operation'),
@@ -111,7 +102,7 @@ function activity_views_data() {
   foreach (activity_get_module_info() as $module => $info) {
     if (!empty($info->realms)) {
       $data['activity_access']["value_$module"] = array(
-        'title' => t("@module Access", array("@module" => drupal_ucfirst($module))),
+        'title' => t("@module module's access control", array("@module" => drupal_ucfirst($module))),
         'help' => t('Allow @module to filter activity messages', array('@module' => $module)),
         'filter' => array(
           'handler' => 'activity_views_handler_filter_access',
Index: views/activity_views_handler_filter_uid_access.inc
===================================================================
RCS file: views/activity_views_handler_filter_uid_access.inc
diff -N views/activity_views_handler_filter_uid_access.inc
--- views/activity_views_handler_filter_uid_access.inc	26 Aug 2009 19:10:28 -0000	1.1.2.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-<?php
-// $Id: activity_views_handler_filter_uid_access.inc,v 1.1.2.2 2009/08/26 19:10:28 scottreynolds Exp $
-
-class activity_views_handler_filter_uid_access extends views_handler_filter {
-  /**
-   * tell Views u can't expose this
-   */
-  function can_expose() {
-    return FALSE;
-  }
-  
-  function query() {
-    $this->ensure_my_table();
-    $group = activity_views_group();
-    if (is_null($group)) {
-      // static cache the where group for the rest of the handlers
-      $group = activity_views_group($this->query->set_where_group('OR'));
-    }
-    // tell it that you can have access to it as the actor
-    $this->query->add_where($group, "($this->table_alias.$this->real_field = %d)", activity_views_access_user()->uid);
-  }
-}
\ No newline at end of file