mirror of
https://github.com/gryf/wicd.git
synced 2025-12-20 12:58:07 +01:00
Fixed asynchronous Autoconnect calls so that they actually work properly
This commit is contained in:
@@ -19,20 +19,26 @@
|
|||||||
|
|
||||||
import dbus
|
import dbus
|
||||||
import time
|
import time
|
||||||
|
import gobject
|
||||||
|
from dbus.mainloop.glib import DBusGMainLoop
|
||||||
|
|
||||||
|
DBusGMainLoop(set_as_default=True)
|
||||||
bus = dbus.SystemBus()
|
bus = dbus.SystemBus()
|
||||||
proxy_obj = bus.get_object('org.wicd.daemon', '/org/wicd/daemon')
|
proxy_obj = bus.get_object('org.wicd.daemon', '/org/wicd/daemon')
|
||||||
daemon = dbus.Interface(proxy_obj, 'org.wicd.daemon')
|
daemon = dbus.Interface(proxy_obj, 'org.wicd.daemon')
|
||||||
|
|
||||||
def reply_handle(r):
|
def reply_handle():
|
||||||
pass
|
loop.quit()
|
||||||
def error_handle(e):
|
def error_handle(e):
|
||||||
pass
|
loop.quit()
|
||||||
|
|
||||||
print daemon.Hello()
|
print daemon.Hello()
|
||||||
time.sleep(3)
|
time.sleep(3)
|
||||||
daemon.SetSuspend(False)
|
daemon.SetSuspend(False)
|
||||||
daemon.SetForcedDisconnect(False)
|
|
||||||
if not daemon.CheckIfConnecting():
|
if not daemon.CheckIfConnecting():
|
||||||
print daemon.AutoConnect(True, reply_handler=reply_handle,
|
print daemon.AutoConnect(True, reply_handler=reply_handle,
|
||||||
error_handler=error_handle)
|
error_handler=error_handle)
|
||||||
|
daemon.SetForcedDisconnect(False)
|
||||||
|
|
||||||
|
loop = gobject.MainLoop()
|
||||||
|
loop.run()
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import dbus
|
|||||||
import gobject
|
import gobject
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
from dbus.mainloop.glib import DBusGMainLoop
|
||||||
|
|
||||||
import wpath
|
import wpath
|
||||||
import misc
|
import misc
|
||||||
@@ -37,6 +38,7 @@ if sys.platform == 'linux2':
|
|||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
wpath.chdir(__file__)
|
wpath.chdir(__file__)
|
||||||
|
|
||||||
|
DBusGMainLoop(set_as_default=True)
|
||||||
proxy_obj = dbus.SystemBus().get_object('org.wicd.daemon', '/org/wicd/daemon')
|
proxy_obj = dbus.SystemBus().get_object('org.wicd.daemon', '/org/wicd/daemon')
|
||||||
daemon = dbus.Interface(proxy_obj, 'org.wicd.daemon')
|
daemon = dbus.Interface(proxy_obj, 'org.wicd.daemon')
|
||||||
wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired')
|
wired = dbus.Interface(proxy_obj, 'org.wicd.daemon.wired')
|
||||||
@@ -239,7 +241,7 @@ class ConnectionStatus():
|
|||||||
error_handler=err_handle)
|
error_handler=err_handle)
|
||||||
self.reconnecting = False
|
self.reconnecting = False
|
||||||
|
|
||||||
def reply_handle(r):
|
def reply_handle():
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def err_handle(e):
|
def err_handle(e):
|
||||||
|
|||||||
Reference in New Issue
Block a user