Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

.gitignore

@@ -6,3 +6,4 @@ src/libs
 .idea
 *~
 *.iml
+*.so

src/tox.py

@@ -1,5 +1,7 @@
+# -*- coding: utf-8 -*-
 from ctypes import *
 from settings import Settings
+import os
 
 
 class ToxOptions(Structure):
@@ -13,25 +15,37 @@ class ToxOptions(Structure):
         ("end_port", c_uint16),
         ("tcp_port", c_uint16),
         ("savedata_type", c_int),
-        ("savedata_data", POINTER(c_uint8)),
+        ("savedata_data", c_char_p),
         ("savedata_length", c_size_t)
         ]
 
 
 class Tox(object):
 
-    def __init__(self, name):
-        path = Settings.get_default_path() + name + '.tox'
-        with open(path, 'rb') as fl:
+    def __init__(self, name, path=None):
+        if path is None:
+            path = Settings.get_default_path()
+        full_path = path + name + '.tox'
+        with open(full_path, 'rb') as fl:
             data = fl.read()
             size = len(data)
             print size
-        libtoxcore = CDLL('libtoxcore.so')
-        libtoxcore.tox_options_new.restype = POINTER(ToxOptions)
-        self.tox_options = libtoxcore.tox_options_new(0)
-        libtoxcore.tox_new.restype = POINTER(c_void_p)
-        tox = libtoxcore.tox_new(None, None)
-        self.libtoxcore = libtoxcore
+        # TODO: different names for different OS
+        temp = os.path.abspath(__file__)
+        temp = os.path.realpath(temp)
+        temp = os.path.dirname(temp)
+        os.chdir(temp + '/libs/')
+        self.libtoxcore = CDLL('libtoxcore.so')
+        print self.libtoxcore.__dict__
+        self.libtoxcore.tox_options_new.restype = POINTER(ToxOptions)
+        # TODO: load from settings
+        self.tox_options = self.libtoxcore.tox_options_new(0)
+        self.tox_options.contents.savedata_length = size
+        self.tox_options.contents.savedata_data = c_char_p(data)
+        self.libtoxcore.tox_new.restype = POINTER(c_void_p)
+        self.tox = self.libtoxcore.tox_new(self.tox_options, None)  # Tox *tox
+        print self.tox.contents
+
 
 if __name__ == "__main__":
     t = Tox('tox_save')