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

Altered autoconnection code to fall back to wireless if wired fails because there is no default profile set.

Browse Source
This commit is contained in:
imdano
2008-02-29 22:14:32 +00:00
parent 189dcc698b
commit 08b9f9f993
1 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
daemon.py
View File

@@ -351,33 +351,49 @@ class ConnectionWizard(dbus.service.Object):
self.Scan() self.Scan()
#self.AutoConnectScan() # Also scans for hidden networks #self.AutoConnectScan() # Also scans for hidden networks
if self.CheckPluggedIn(): if self.CheckPluggedIn():
if self.GetWiredAutoConnectMethod() == 2 and \ self._wired_autoconnect()
else:
self._wireless_autoconnect()
def _wired_autoconnect(self):
""" Attempts to autoconnect to a wired network. """
if self.GetWiredInterface() is None:
print 'no wired interface available'
return
if self.GetWiredAutoConnectMethod() == 2 and \
not self.GetNeedWiredProfileChooser(): not self.GetNeedWiredProfileChooser():
self.LaunchChooser() self.LaunchChooser()
elif self.GetWiredAutoConnectMethod != 2: elif self.GetWiredAutoConnectMethod != 2:
defaultNetwork = self.GetDefaultWiredNetwork() defaultNetwork = self.GetDefaultWiredNetwork()
if defaultNetwork != None: if defaultNetwork != None:
self.ReadWiredNetworkProfile(defaultNetwork) self.ReadWiredNetworkProfile(defaultNetwork)
self.ConnectWired() self.ConnectWired()
print "Attempting to autoconnect with wired interface..." print "Attempting to autoconnect with wired interface..."
else:
print "Couldn't find a default wired connection, \
wired autoconnect failed"
else:
print "No wired connection present, attempting to autoconnect \
to wireless network"
if self.GetWirelessInterface() != None:
for x, network in enumerate(self.LastScan):
if bool(self.LastScan[x]["has_profile"]):
print self.LastScan[x]["essid"] + ' has profile'
if bool(self.LastScan[x].get('automatic')):
print 'trying to automatically connect to...', self.LastScan[x]["essid"]
self.ConnectWireless(x)
time.sleep(1)
return
print "Unable to autoconnect, you'll have to manually connect"
else: else:
print 'autoconnect failed because wireless interface returned None' print "Couldn't find a default wired connection, \
wired autoconnect failed"
self._wireless_autoconnect()
def _wireless_autoconnect(self):
print "No wired connection present, attempting to autoconnect \
to wireless network"
if self.GetWirelessInterface() is None:
print 'autoconnect failed because wireless interface returned None'
return
for x, network in enumerate(self.LastScan):
if bool(self.LastScan[x]["has_profile"]):
print self.LastScan[x]["essid"] + ' has profile'
if bool(self.LastScan[x].get('automatic')):
print 'trying to automatically connect to...', self.LastScan[x]["essid"]
self.ConnectWireless(x)
time.sleep(1)
return
print "Unable to autoconnect, you'll have to manually connect"
@dbus.service.method('org.wicd.daemon') @dbus.service.method('org.wicd.daemon')
def GetAutoReconnect(self): def GetAutoReconnect(self):