gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-03-27 22:43:33 +01:00
Code Issues Projects Releases Wiki Activity

Don't duplicate code

Browse Source
This commit is contained in:
David Paleino
2011-12-08 13:23:29 +01:00
parent ef54b61cb3
commit 6adb75f821
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wicd/wicd-daemon.py
View File

@@ -66,9 +66,9 @@ if __name__ == '__main__':
misc.RenameProcess("wicd") misc.RenameProcess("wicd")
wireless_conf = wpath.etc + "wireless-settings.conf" wireless_conf = os.path.join(wpath.etc, "wireless-settings.conf")
wired_conf = wpath.etc + "wired-settings.conf" wired_conf = os.path.join(wpath.etc, "wired-settings.conf")
dhclient_conf = wpath.etc + "dhclient.conf.template" dhclient_conf = os.path.join(wpath.etc, "dhclient.conf.template")
class WicdDaemon(dbus.service.Object): class WicdDaemon(dbus.service.Object):
""" The main wicd daemon class. """ The main wicd daemon class.
@@ -944,9 +944,7 @@ class WirelessDaemon(dbus.service.Object):
self._debug_mode = debug self._debug_mode = debug
self._scanning = False self._scanning = False
self.LastScan = [] self.LastScan = []
self.config = ConfigManager(os.path.join(wpath.etc, self.config = ConfigManager(wireless_conf, debug=debug)
"wireless-settings.conf"),
debug=debug)
def get_debug_mode(self): def get_debug_mode(self):
return self._debug_mode return self._debug_mode
@@ -1355,9 +1353,7 @@ class WiredDaemon(dbus.service.Object):
self._debug_mode = debug self._debug_mode = debug
self._cur_wired_prof_name = "" self._cur_wired_prof_name = ""
self.WiredNetwork = {} self.WiredNetwork = {}
self.config = ConfigManager(os.path.join(wpath.etc, self.config = ConfigManager(wired_conf, debug=debug)
"wired-settings.conf"),
debug=debug)
def get_debug_mode(self): def get_debug_mode(self):
return self._debug_mode return self._debug_mode