From e79438fe385e6f0315edc4e5a5ca99e6831c08fe Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Tue, 29 Jun 2010 19:50:12 +0200 Subject: [PATCH] Don't abort when loading bridges fails --- src/status-area-applet-tor.vala | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/status-area-applet-tor.vala b/src/status-area-applet-tor.vala index d384053..b0a21d2 100644 --- a/src/status-area-applet-tor.vala +++ b/src/status-area-applet-tor.vala @@ -176,22 +176,18 @@ class TorStatusMenuItem : HD.StatusMenuItem { private async void tor_control_auth () throws Error { yield tor_control.authenticate_async (password); - try { - var bridges = gconf.get_list (GCONF_KEY_BRIDGES, GConf.ValueType.STRING); + var bridges = gconf.get_list (GCONF_KEY_BRIDGES, GConf.ValueType.STRING); - if (bridges.length () > 0) { - // Enable bridge relays - tor_control.set_conf_list ("Bridge", bridges); - tor_control.set_conf_bool ("UseBridges", true); + if (bridges.length () > 0) { + // Enable bridge relays + tor_control.set_conf_list ("Bridge", bridges); + tor_control.set_conf_bool ("UseBridges", true); - bool use = yield tor_control.get_conf_bool_async ("UseBridges"); - if (!use) { - Hildon.Banner.show_information (null, null, - "Failed to set up bridge relays"); - } + bool use = yield tor_control.get_conf_bool_async ("UseBridges"); + if (!use) { + Hildon.Banner.show_information (null, null, + "Failed to set up bridge relays"); } - } catch (Error e) { - error ("Error loading bridges: %s", e.message); } } @@ -463,7 +459,7 @@ class TorStatusMenuItem : HD.StatusMenuItem { try { bridges = gconf.get_list (GCONF_KEY_BRIDGES, GConf.ValueType.STRING); } catch (Error e) { - error ("Error loading bridges: %s", e.message); + critical ("Error loading bridges: %s", e.message); } foreach (string bridge in bridges) { if (list == null) -- 1.7.9.5