Control: tags -1 638591 patch upstream

On 2014-12-29 02:31:40 +0100, Vincent Lefevre wrote:
[...]
> part. But since when the GUI is open, I do not get the
> "Autoconnecting..." log message, this means that all this
> code was not executed in this particular case, and that
> the above change cannot have any effect.

Indeed, this patch had no effect here.

> Perhaps the following needs to be modified too:
> 
>     def ShouldAutoReconnect(self):
>         """ Returns True if it's the right time to try autoreconnecting. """
>         if self.GetAutoReconnect() and not self.CheckIfConnecting() and \
>            not self.GetForcedDisconnect() and not self.auto_connecting and \
>            not self.gui_open:
>             return True
>         else:
>             return False
> 
> i.e. remove "and not self.gui_open".

and this solves the problem.

I'm attaching the patch.

-- 
Vincent Lefèvre <vinc...@vinc17.net> - Web: <https://www.vinc17.net/>
100% accessible validated (X)HTML - Blog: <https://www.vinc17.net/blog/>
Work: CR INRIA - computer arithmetic / AriC project (LIP, ENS-Lyon)
--- wicd.orig/wicd/wicd-daemon.py       2014-12-29 02:32:48.000000000 +0100
+++ wicd-1.7.2.4/wicd/wicd-daemon.py    2014-12-29 03:41:13.457540931 +0100
@@ -349,11 +349,6 @@
             if self.debug_mode:
                 print 'Already connecting, doing nothing.'
             return
-        # We don't want to rescan/connect if the gui is open.
-        if self.gui_open:
-            if self.debug_mode:
-                print "Skipping autoconnect because GUI is open."
-            return
         if self.wired_bus.CheckPluggedIn():
             if self.debug_mode:
                 print "Starting wired autoconnect..."
@@ -442,8 +437,7 @@
     def ShouldAutoReconnect(self):
         """ Returns True if it's the right time to try autoreconnecting. """
         if self.GetAutoReconnect() and not self.CheckIfConnecting() and \
-           not self.GetForcedDisconnect() and not self.auto_connecting and \
-           not self.gui_open:
+           not self.GetForcedDisconnect() and not self.auto_connecting:
             return True
         else:
             return False

Reply via email to