update of test, callbacks, linux load

This commit is contained in:
ingvar1995 2016-02-23 14:11:00 +03:00
parent 18e027ffd9
commit b9d102a15a
4 changed files with 22 additions and 7 deletions

View file

@ -11,10 +11,15 @@ def friend_status(a, b, c, d):
def friend_message(a, b, c, d, e, f):
print 'Message: ', unicode(d, "utf-8")
print 'Message: ', str(d)
def init_callbacks(tox):
def init_callbacks(tox, window):
"""
:param tox: tox instance
:param window: main window
:return: None
"""
tox.callback_friend_status(friend_status, 0)
tox.callback_friend_message(friend_message, 0)
tox.callback_self_connection_status(self_connection_status, 0)

View file

@ -73,7 +73,7 @@ def main():
# bootstrap
for data in node_generator():
tox.bootstrap(*data)
init_callbacks(tox)
init_callbacks(tox, ms)
# starting thread for tox iterate
mainloop = ToxIterateThread(tox)
mainloop.start()

View file

@ -24,9 +24,8 @@ class ToxOptions(Structure):
class LibToxCore(object):
def __init__(self):
if system() == 'Linux':
temp = os.path.dirname(os.path.abspath(__file__)) + '/libs/'
os.chdir(temp)
self._libtoxcore = CDLL(temp + 'libtoxcore.so')
# be sure that libtoxcore and libsodium are installed in your os
self._libtoxcore = CDLL('libtoxcore.so')
elif system() == 'Windows':
self._libtoxcore = CDLL('libs/libtox.dll')
else: