diff --git a/INSTALL b/INSTALL index ddec942..26af7fe 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ To install, just run: sudo python setup.py install For now almost all the files and directories are dumped to /opt/wicd, though -it's possible for the user to specify a different directory by editting two files; +it's possible for the user to specify a different directory by editing two files; setup.cfg, and wpath.py. Simply change all mentions of /opt/wicd in those files to the directory of your choice. diff --git a/README b/README index 5172e6e..53ca762 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THEORY OF OPERATION: Wicd is designed to give the user as much control over the behavior of network connections -as possible. Every network, both wired and wireless, has it's own profile, with it's own +as possible. Every network, both wired and wireless, has its own profile, with its own configuration options and connection behavior. Wicd will try to automatically connect only to the networks the user specifies it should try, with a preference first to a wired network, then to wireless. @@ -47,7 +47,7 @@ is split between two processes, daemon.py and monitor.py. All the connection st monitoring, as well as the auto-reconnection logic, takes place in monitor.py. Everthing else is done by daemon.py. -The user-interface, made up of a tray icon, main GUI window, and its child dialogs, +The user-interface (stored in wicd.py), made up of a tray icon, main GUI window, and its child dialogs, gets configuration and network information from the daemon by either querying it, using the methods in the daemon's dbus interface, or by receiving signals emitted from the daemon over D-Bus. Any configuration changes made in the UI are passed back to the daemon, which diff --git a/daemon.py b/daemon.py index d9756e9..dcdde62 100644 --- a/daemon.py +++ b/daemon.py @@ -166,7 +166,7 @@ class ConnectionWizard(dbus.service.Object): # Scan since we just got started if auto_connect: - print "autoconnecting...", str(self.GetWirelessInterface()[5:]) + print "autoconnecting...", str(self.GetWirelessInterface()) self.AutoConnect(True) else: print "--no-scan detected, not autoconnecting..." @@ -366,6 +366,12 @@ class ConnectionWizard(dbus.service.Object): def _wired_autoconnect(self): """ Attempts to autoconnect to a wired network. """ + if self.GetWiredAutoConnectMethod() == 3 and \ + not self.GetNeedWiredProfileChooser(): + # attempt to smartly connect to a wired network + # by using various wireless networks detected + # and by using plugged in USB devices + print self.LastScan if self.GetWiredAutoConnectMethod() == 2 and \ not self.GetNeedWiredProfileChooser(): self.LaunchChooser()