diff --git a/daemon.py b/daemon.py index 7edb3ce..3c0ba38 100644 --- a/daemon.py +++ b/daemon.py @@ -380,7 +380,7 @@ class ConnectionWizard(dbus.service.Object): @dbus.service.method('org.wicd.daemon.wireless') def CheckIfWirelessConnecting(self): - '''reutrns True if wireless interface is connecting, otherwise False''' + '''returns True if wireless interface is connecting, otherwise False''' if not self.wifi.ConnectingThread == None: #if ConnectingThread exists, then check for it's #status, if it doesn't, we aren't connecting @@ -426,9 +426,9 @@ class ConnectionWizard(dbus.service.Object): @dbus.service.method('org.wicd.daemon.wired') def GetWiredIP(self): - '''returns the wired interface's ip address''' + '''returns the wired interface\'s ip address''' ip = self.wired.GetIP() - print 'returing wired ip',ip + print 'returning wired ip',ip return ip @dbus.service.method('org.wicd.daemon.wired') @@ -447,7 +447,7 @@ class ConnectionWizard(dbus.service.Object): @dbus.service.method('org.wicd.daemon.wired') def CheckWiredConnectingMessage(self): - '''returns the wired interface's status message''' + '''returns the wired interface\'s status message''' if not self.wired.ConnectingThread == None: status = self.wired.ConnectingThread.GetStatus() print 'wired connect status',status @@ -493,7 +493,7 @@ class ConnectionWizard(dbus.service.Object): @dbus.service.method('org.wicd.daemon.wired') def CheckPluggedIn(self): if not self.wired.wired_interface == None: - return self.__printReturn('returing plugged in',self.wired.CheckPluggedIn()) + return self.__printReturn('returning plugged in',self.wired.CheckPluggedIn()) else: return self.__printReturn("returning plugged in",None) diff --git a/edgy.py b/edgy.py index ee7f8e5..d8f6c1e 100644 --- a/edgy.py +++ b/edgy.py @@ -35,7 +35,7 @@ except: print 'daemon not running, running gksudo ./daemon.py...' import misc misc.PromptToStartDaemon() - time.sleep(1) + time.sleep(5) try: proxy_obj = bus.get_object('org.wicd.daemon', '/org/wicd/daemon') except: diff --git a/misc.py b/misc.py index bb97c0c..eff9a71 100644 --- a/misc.py +++ b/misc.py @@ -24,7 +24,7 @@ def Run(cmd,include_std_error=False): def PromptToStartDaemon(): gksudo_args = ['gksudo', '--message', 'Wicd needs to access your computer\'s network cards.','--','./daemon.py'] - os.spawnvpe(os.P_WAIT, 'gksudo', gksudo_args, os.environ) + os.spawnvpe(os.P_NOWAIT, 'gksudo', gksudo_args, os.environ) def RunRegex(regex,string): m = regex.search( string )