--- service_links.module.old	2006-06-26 03:03:00.000000000 +0200
+++ service_links.module	2006-07-19 19:24:29.000000000 +0200
@@ -46,6 +46,15 @@
     '#options' => node_get_types(),
   );
 
+  if (module_exist('aggregator2')) {
+    $form['service_links_agg2_link'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use link to original article aggregated by aggregator2 module'),
+      '#return_value' => 1,
+      '#default_value' => variable_get('service_links_agg2_link', 0),
+    );
+  }
+
   $form['what_links_to_show'] = array(
     '#type' => 'fieldset',
     '#title' => t('What bookmark links to show'),
@@ -165,7 +174,12 @@
 
       $node_type = in_array($node->type, variable_get('service_links_node_types', array()), TRUE);
       if ($node_type && user_access('use service links')) {
-        $url = url("node/$node->nid", NULL, NULL, TRUE);
+        if (variable_get('service_links_agg2_link', 0) && $node->link) {
+          $url = ($node->source_link ? $node->source_link : $node->link);
+        }
+        else {
+          $url = url("node/$node->nid", NULL, NULL, TRUE);
+        }
         $title = drupal_urlencode($node->title);
 
         switch (variable_get('service_links_in_node', 0)) {
@@ -220,7 +234,13 @@
   $node_type = in_array($node->type, variable_get('service_links_node_types', array()), TRUE);
 
   if ($type == 'node' && $node_type && $show_links && user_access('use service links')) {
-    $url = url("node/$node->nid", NULL, NULL, TRUE);
+    if (variable_get('service_links_agg2_link', 0) && $node->link) {
+      $url = ($node->source_link ? $node->source_link : $node->link);
+    }
+    else {
+      $url = url("node/$node->nid", NULL, NULL, TRUE);
+    }
+
     $title = drupal_urlencode($node->title);
     $links = _service_links_render($url, $title);
   }
@@ -241,7 +261,13 @@
       $node = node_load(arg(1));
       $node_type = in_array($node->type, variable_get('service_links_node_types', array()), TRUE);
       if ($node_type) {
-        $url = url("node/$node->nid", NULL, NULL, TRUE);
+        if (variable_get('service_links_agg2_link', 0) && $node->link) {
+          $url = ($node->source_link ? $node->source_link : $node->link);
+        }
+        else {
+          $url = url("node/$node->nid", NULL, NULL, TRUE);
+        }
+
         $title = drupal_urlencode($node->title);
 
         $block['subject'] = t('Bookmark/Search this post');