diff --git a/shadowsocks-csharp/Controller/PolipoRunner.cs b/shadowsocks-csharp/Controller/PolipoRunner.cs index a82333f5..de1c3c3a 100644 --- a/shadowsocks-csharp/Controller/PolipoRunner.cs +++ b/shadowsocks-csharp/Controller/PolipoRunner.cs @@ -12,7 +12,6 @@ namespace Shadowsocks.Controller class PolipoRunner { private Process _process; - public bool openOnLan; public void Start(Configuration configuration) { @@ -32,10 +31,10 @@ namespace Shadowsocks.Controller Console.WriteLine(e.ToString()); } } - string temppath = Path.GetTempPath(); + string temppath = Path.GetTempPath(); string polipoConfig = Resources.polipo_config; polipoConfig = polipoConfig.Replace("__SOCKS_PORT__", server.local_port.ToString()); - polipoConfig = polipoConfig.Replace("__POLIPO_BIND_IP__", configuration.shareOverLan ? "0.0.0.0" : "127.0.0.1"); + polipoConfig = polipoConfig.Replace("__POLIPO_BIND_IP__", configuration.shareOverLan ? "0.0.0.0" : "127.0.0.1"); FileManager.ByteArrayToFile(temppath + "/polipo.conf", System.Text.Encoding.UTF8.GetBytes(polipoConfig)); FileManager.UncompressFile(temppath + "/ss_polipo.exe", Resources.polipo_exe); diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs index 8b4fcae6..9721fb45 100644 --- a/shadowsocks-csharp/Controller/ShadowsocksController.cs +++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs @@ -19,7 +19,6 @@ namespace Shadowsocks.Controller private Configuration _config; private PolipoRunner polipoRunner; private bool stopped = false; - private bool openOnLan; public class PathEventArgs : EventArgs { @@ -36,12 +35,6 @@ namespace Shadowsocks.Controller public ShadowsocksController() { _config = Configuration.Load(); - if (_config.enableLog) - { - SetLog(); - } - - openOnLan = _config.openOnLan; polipoRunner = new PolipoRunner(); polipoRunner.Start(_config); local = new Local(_config); diff --git a/shadowsocks-csharp/Model/Configuration.cs b/shadowsocks-csharp/Model/Configuration.cs index 4869e2c8..60aabbdc 100755 --- a/shadowsocks-csharp/Model/Configuration.cs +++ b/shadowsocks-csharp/Model/Configuration.cs @@ -17,8 +17,6 @@ namespace Shadowsocks.Model public bool enabled; public bool shareOverLan; public bool isDefault; - public bool openOnLan; - public bool enableLog; public bool noChange; private static string CONFIG_FILE = "gui-config.json"; diff --git a/shadowsocks-csharp/View/ConfigForm.cs b/shadowsocks-csharp/View/ConfigForm.cs index 80d31c09..fdedba73 100644 --- a/shadowsocks-csharp/View/ConfigForm.cs +++ b/shadowsocks-csharp/View/ConfigForm.cs @@ -374,10 +374,5 @@ namespace Shadowsocks.View qrCodeForm.Icon = this.Icon; qrCodeForm.Show(); } - - private void enableLogBox_CheckedChanged(object sender, EventArgs e) - { - MessageBox.Show("This option only works on next startup."); - } } }