Index: /trunk/ActionStreams/plugins/ActionStreams/streams.yaml
===================================================================
--- /trunk/ActionStreams/plugins/ActionStreams/streams.yaml (revision 1548)
+++ /trunk/ActionStreams/plugins/ActionStreams/streams.yaml (revision 1564)
@@ -316,4 +316,9 @@
         name: Shared
         description: Your shared items
+        fields:
+            - note
+            - source_title
+            - source_url
+            - summary
         html_form: '[_1] shared <a href="[_2]">[_3]</a> from <a href="[_4]">[_5]</a>'
         html_params:
@@ -322,5 +327,13 @@
             - source_url
             - source_title
-        class: GoogleReader
+        url: "http://www.google.com/reader/public/atom/user/{{ident}}/state/com.google/broadcast"
+        atom:
+            summary: summary
+            enclosure: "link[@rel='enclosure']/@href"
+            source_title: source/title
+            source_url: "source/link[@rel='alternate']/@href"
+            note: gr:annotation/content
+            created_on: ''
+            modified_on: ''
 iconbuffet:
     icons:
Index: /trunk/ActionStreams/plugins/ActionStreams/config.yaml
===================================================================
--- /trunk/ActionStreams/plugins/ActionStreams/config.yaml (revision 1547)
+++ /trunk/ActionStreams/plugins/ActionStreams/config.yaml (revision 1564)
@@ -47,4 +47,5 @@
     pre_build_action_streams_event.flickr_photos:           $ActionStreams::ActionStreams::Fix::flickr_photo_thumbnail
     pre_build_action_streams_event.gametap_scores:          $ActionStreams::ActionStreams::Fix::gametap_score_stuff
+    pre_build_action_streams_event.googlereader_links:      $ActionStreams::ActionStreams::Fix::googlereader_link_links
     pre_build_action_streams_event.identica_statuses:       $ActionStreams::ActionStreams::Fix::twitter_tweet_name
     pre_build_action_streams_event.iminta_links:            $ActionStreams::ActionStreams::Fix::iminta_link_title
Index: /unk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Event/GoogleReader.pm
===================================================================
--- /trunk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Event/GoogleReader.pm (revision 1310)
+++  (revision )
@@ -1,49 +1,0 @@
-
-package ActionStreams::Event::GoogleReader;
-
-use strict;
-use base qw( ActionStreams::Event );
-
-__PACKAGE__->install_properties({
-    class_type => 'googlereader_links',
-});
-
-__PACKAGE__->install_meta({
-    columns => [ qw(
-        summary
-        source_title
-        source_url
-        note
-    ) ],
-});
-
-sub update_events {
-    my $class = shift;
-    my %profile = @_;
-    my ($ident, $author) = @profile{qw( ident author )};
-
-    my $items = $class->fetch_xpath(
-        url => "http://www.google.com/reader/public/atom/user/$ident/state/com.google/broadcast",
-        foreach => '//entry',
-        get => {
-            title        => 'title/child::text()',
-            summary      => 'summary/child::text()',
-            url          => q(link[@rel='alternate']/@href),
-            enclosure    => q(link[@rel='enclosure']/@href),
-            source_title => 'source/title/child::text()',
-            source_url   => q(source/link[@rel='alternate']/@href),
-            note         => 'gr:annotation/content/child::text()',
-        },
-    );
-	return if !$items;
-
-    for my $item (@$items) {
-        my $enclosure = delete $item->{enclosure};
-        $item->{url} ||= $enclosure;
-        $item->{identifier} = $item->{url};
-    }
-
-    $class->build_results( author => $author, items => $items );
-}
-
-1;
Index: /trunk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Fix.pm
===================================================================
--- /trunk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Fix.pm (revision 1562)
+++ /trunk/ActionStreams/plugins/ActionStreams/lib/ActionStreams/Fix.pm (revision 1564)
@@ -45,4 +45,11 @@
         $item->{thumbnail} = $thumb;
     }
+}
+
+sub googlereader_link_links {
+    my ($cb, $app, $item, $event, $author, $profile) = @_;
+    my $enclosure = delete $item->{enclosure};
+    $item->{url} ||= $enclosure || q{};
+    $item->{identifier} = $item->{url} if $item->{url};
 }