1
0
mirror of https://github.com/gryf/wicd.git synced 2025-12-20 04:48:00 +01:00

Make sure daemon alerts tray to change status during connection process.

Specify which network is being connected to in both the tray tooltip and gui statusbar
Clean up code in wicd.py.
Refactor Edgy/DapperTrayIcon class names to something less Ubuntu-specific.
Fix typo in EggTrayIcon that would keep gui from opening.
This commit is contained in:
imdano
2007-12-22 22:09:00 +00:00
parent 8a0a471764
commit 7d7b943ee7
3 changed files with 75 additions and 45 deletions

View File

@@ -434,7 +434,6 @@ class ConnectionWizard(dbus.service.Object):
Scans for wireless networks and also for hidden networks defined in
wireless-settings.conf
'''
hidden_network_list = self.GetHiddenNetworkList()
master_scan = self.Scan()
@@ -1471,6 +1470,8 @@ class ConnectionStatus():
if not wireless_found: # No connection at all
if not conn.CheckIfConnecting():
self.auto_reconnect()
else:
self.status_changed = True
# Send a D-Bus signal announcing status has changed if necessary.
if self.status_changed:
conn.StatusChanged()
@@ -1489,8 +1490,7 @@ class ConnectionStatus():
conn.SetCurrentInterface('')
self.status_changed = True
if conn.GetAutoReconnect() and \
not conn.CheckIfConnecting() and \
if conn.GetAutoReconnect() and not conn.CheckIfConnecting() and \
not conn.GetForcedDisconnect():
print 'Starting automatic reconnect process'
# First try connecting through ethernet