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

Fixed bug where tray wouldn't load when it automatically opened the daemon

Browse Source 
Fixed some typos
This commit is contained in:
imdano
2007-07-05 05:30:09 +00:00
parent 709efd2ac4
commit 7b541011b5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
daemon.py
View File

@@ -380,7 +380,7 @@ class ConnectionWizard(dbus.service.Object):
@dbus.service.method('org.wicd.daemon.wireless') @dbus.service.method('org.wicd.daemon.wireless')
def CheckIfWirelessConnecting(self): 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 not self.wifi.ConnectingThread == None:
#if ConnectingThread exists, then check for it's #if ConnectingThread exists, then check for it's
#status, if it doesn't, we aren't connecting #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') @dbus.service.method('org.wicd.daemon.wired')
def GetWiredIP(self): def GetWiredIP(self):
'''returns the wired interface's ip address''' '''returns the wired interface\'s ip address'''
ip = self.wired.GetIP() ip = self.wired.GetIP()
print 'returing wired ip',ip print 'returning wired ip',ip
return ip return ip
@dbus.service.method('org.wicd.daemon.wired') @dbus.service.method('org.wicd.daemon.wired')
@@ -447,7 +447,7 @@ class ConnectionWizard(dbus.service.Object):
@dbus.service.method('org.wicd.daemon.wired') @dbus.service.method('org.wicd.daemon.wired')
def CheckWiredConnectingMessage(self): def CheckWiredConnectingMessage(self):
'''returns the wired interface's status message''' '''returns the wired interface\'s status message'''
if not self.wired.ConnectingThread == None: if not self.wired.ConnectingThread == None:
status = self.wired.ConnectingThread.GetStatus() status = self.wired.ConnectingThread.GetStatus()
print 'wired connect status',status print 'wired connect status',status
@@ -493,7 +493,7 @@ class ConnectionWizard(dbus.service.Object):
@dbus.service.method('org.wicd.daemon.wired') @dbus.service.method('org.wicd.daemon.wired')
def CheckPluggedIn(self): def CheckPluggedIn(self):
if not self.wired.wired_interface == None: 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: else:
return self.__printReturn("returning plugged in",None) return self.__printReturn("returning plugged in",None)

2
edgy.py
View File

@@ -35,7 +35,7 @@ except:
print 'daemon not running, running gksudo ./daemon.py...' print 'daemon not running, running gksudo ./daemon.py...'
import misc import misc
misc.PromptToStartDaemon() misc.PromptToStartDaemon()
time.sleep(1) time.sleep(5)
try: try:
proxy_obj = bus.get_object('org.wicd.daemon', '/org/wicd/daemon') proxy_obj = bus.get_object('org.wicd.daemon', '/org/wicd/daemon')
except: except:

2
misc.py
View File

@@ -24,7 +24,7 @@ def Run(cmd,include_std_error=False):
def PromptToStartDaemon(): def PromptToStartDaemon():
gksudo_args = ['gksudo', '--message', 'Wicd needs to access your computer\'s network cards.','--','./daemon.py'] 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): def RunRegex(regex,string):
m = regex.search( string ) m = regex.search( string )