diff --git a/wicd/networking.py b/wicd/networking.py index 5ee9d05..02a659f 100644 --- a/wicd/networking.py +++ b/wicd/networking.py @@ -132,7 +132,7 @@ def expand_script_macros(script, msg, bssid, essid): class Controller(object): """ Parent class for the different interface types. """ - def __init__(self): + def __init__(self, debug=False): """ Initialise the class. """ self.global_dns_1 = None self.global_dns_2 = None @@ -141,7 +141,7 @@ class Controller(object): self.global_search_dom = None self._dhcp_client = None self._flush_tool = None - self._debug = None + self._debug = debug self._backend = None self.connecting_thread = None self.before_script = None @@ -477,9 +477,9 @@ class ConnectThread(threading.Thread): class Wireless(Controller): """ A wrapper for common wireless interface functions. """ - def __init__(self): + def __init__(self, debug=False): """ Initialize the class. """ - Controller.__init__(self) + Controller.__init__(self, debug=debug) self._wpa_driver = None self._wireless_interface = None self.wiface = None @@ -844,9 +844,9 @@ class WirelessConnectThread(ConnectThread): class Wired(Controller): """ A wrapper for common wired interface functions. """ - def __init__(self): + def __init__(self, debug=False): """ Initialise the class. """ - Controller.__init__(self) + Controller.__init__(self, debug=debug) self.wpa_driver = None self._link_detect = None self._wired_interface = None diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index f0daf91..876c33f 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -79,10 +79,11 @@ class WicdDaemon(dbus.service.Object): """ Initializes the daemon DBus object. """ dbus.service.Object.__init__(self, bus_name=bus_name, object_path=object_path) - self.wifi = networking.Wireless() - self.wired = networking.Wired() self.config = ConfigManager(os.path.join(wpath.etc, "manager-settings.conf")) + self._debug_mode = bool(self.config.get("Settings", "debug_mode")) + self.wifi = networking.Wireless(debug=self._debug_mode) + self.wired = networking.Wired(debug=self._debug_mode) self.wired_bus= WiredDaemon(bus_name, self, wired=self.wired) self.wireless_bus = WirelessDaemon(bus_name, self, wifi=self.wifi) self.forced_disconnect = False @@ -274,8 +275,8 @@ class WicdDaemon(dbus.service.Object): """ Sets if debugging mode is on or off. """ self.config.set("Settings", "debug_mode", debug, write=True) self.debug_mode = misc.to_bool(debug) - self.wifi.debug = self.debug_mode - self.wired.debug = self.debug_mode + self.wifi.debug = debug + self.wired.debug = debug self.wireless_bus.debug_mode = debug self.wired_bus.debug_mode = debug