From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 30 Dec 2010 19:35:03 +0000 (+0100)
Subject: Merge branch 'next' into edit-wot-trust
X-Git-Tag: 0.4^2~8^2~39
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=a211a3bd360593efc9e7fba33d607a3b14d0a965;hp=-c

Merge branch 'next' into edit-wot-trust
---

a211a3bd360593efc9e7fba33d607a3b14d0a965
diff --combined src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 1c7e26d,c5c8835..83fc71e
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@@ -25,8 -25,8 +25,8 @@@ import java.util.logging.Logger
  import net.pterodactylus.sone.core.Core;
  import net.pterodactylus.sone.core.FreenetInterface;
  import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
 +import net.pterodactylus.sone.freenet.plugin.PluginConnector;
  import net.pterodactylus.sone.freenet.wot.IdentityManager;
 -import net.pterodactylus.sone.freenet.wot.PluginConnector;
  import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
  import net.pterodactylus.sone.web.WebInterface;
  import net.pterodactylus.util.config.Configuration;
@@@ -167,7 -167,7 +167,7 @@@ public class SonePlugin implements Fred
  		}
  
  		/* create freenet interface. */
- 		FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
+ 		FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
  
  		/* create web of trust connector. */
  		PluginConnector pluginConnector = new PluginConnector(pluginRespirator);