gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-29 01:42:33 +01:00
Code Issues Projects Releases Wiki Activity

Merged r232 from mainline.

Browse Source
This commit is contained in:
Robby Workman
2008-12-28 19:24:37 -06:00
parent b3d695d0ba da54e6033b
commit 4e1ac3e43f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wicd/backends/be-ioctl.py
View File

@@ -49,7 +49,7 @@ import array
NAME = "ioctl" NAME = "ioctl"
UPDATE_INTERVAL = 4 UPDATE_INTERVAL = 4
DESCRIPTION = """IOCTL (new) backend DESCRIPTION = """IOCTL (experimental) backend
This backend uses IOCTL calls and python libraries to query This backend uses IOCTL calls and python libraries to query
network information whenever possible. This makes it fast, network information whenever possible. This makes it fast,

2
wicd/gui.py
View File

@@ -738,7 +738,7 @@ class appGui(object):
self._save_gen_settings(entry) self._save_gen_settings(entry)
entry.set_net_prop("automatic", entry.set_net_prop("automatic",
noneToString(netent.chkbox_autoconnect.get_active())) noneToString(netent.chkbox_autoconnect.get_active()))
if entry.chkbox_global_settings.get_active(): if entry.chkbox_global_settings.get_active():
entry.set_net_prop('use_settings_globally', True) entry.set_net_prop('use_settings_globally', True)
else: else:

2
wicd/networking.py
View File

@@ -780,7 +780,7 @@ class WirelessConnectThread(ConnectThread):
# cards). # cards).
if self.debug: if self.debug:
print "enctype is %s" % self.network.get('enctype') print "enctype is %s" % self.network.get('enctype')
if self.network.get('key') and 'wpa' in self.network.get('enctype'): if self.network.get('key') and 'wpa' in str(self.network.get('enctype')):
self.SetStatus('generating_psk') self.SetStatus('generating_psk')
print 'Generating psk...' print 'Generating psk...'
self.network['psk'] = wiface.GeneratePSK(self.network) self.network['psk'] = wiface.GeneratePSK(self.network)

2
wicd/wicd-daemon.py
View File

@@ -104,7 +104,7 @@ class WicdDaemon(dbus.service.Object):
# This will speed up the scanning process - if a client doesn't # This will speed up the scanning process - if a client doesn't
# need a fresh scan, just feed them the old one. A fresh scan # need a fresh scan, just feed them the old one. A fresh scan
# can be done by calling Scan(fresh=True). # can be done by calling Scan(fresh=True).
self.LastScan = '' self.LastScan = []
signal.signal(signal.SIGTERM, self.DaemonClosing) signal.signal(signal.SIGTERM, self.DaemonClosing)
self.DaemonStarting() self.DaemonStarting()