gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-05 21:34:16 +01:00
Code Issues Projects Releases Wiki Activity

merging in a bunch of trunk changes

Browse Source
This commit is contained in:
Dan O'Reilly
2008-12-07 21:15:29 -05:00
parent a6acb8a661
commit 46bbde7745
8 changed files with 79 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wicd/wicd-daemon.py
View File

@@ -862,7 +862,7 @@ class WirelessDaemon(dbus.service.Object):
@dbus.service.method('org.wicd.daemon.wireless')
def GetIwconfig(self):
""" Calls and returns the output of iwconfig"""
return self.wifi.GetIwconfig()
return misc.to_unicode(self.wifi.GetIwconfig())
@dbus.service.method('org.wicd.daemon.wireless')
def GetNumberOfNetworks(self):
@@ -1506,12 +1506,16 @@ def main(argv):
if redirect_stderr or redirect_stdout:
logpath = os.path.join(wpath.log, 'wicd.log')
if not os.path.exists(wpath.log):
os.makedirs(wpath.log)
os.chmod(wpath.log, 755)
output = ManagedStdio(logpath)
if os.path.exists(logpath):
try:
os.chmod(logpath, 0600)
except:
print 'unable to chmod log file to 0600'
if redirect_stdout: sys.stdout = output
if redirect_stderr: sys.stderr = output