diff options
author | Richard van der Hoff <richard@matrix.org> | 2017-04-24 12:35:17 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2017-04-24 12:35:17 +0100 |
commit | 853ea8fbc7b393455c69de1ce95011117f1423fe (patch) | |
tree | 155ef868e0927f227dd956674237489e0b6c9b01 /python/olm/account.py | |
parent | 1225de14d7aa5e53da51c7008046130996fdaca1 (diff) | |
parent | 51840d82dc6799687873be9839b99738fcd931a6 (diff) |
Merge branch 'master'
Merge master into patched branch to fix conflicts prior to merge back to master
Diffstat (limited to 'python/olm/account.py')
-rw-r--r-- | python/olm/account.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/python/olm/account.py b/python/olm/account.py index e2dcca2..3c9ea88 100644 --- a/python/olm/account.py +++ b/python/olm/account.py @@ -12,6 +12,7 @@ lib.olm_account.restype = c_void_p lib.olm_account_last_error.argtypes = [c_void_p] lib.olm_account_last_error.restype = c_char_p + def account_errcheck(res, func, args): if res == ERR: raise OlmError("%s: %s" % ( @@ -52,6 +53,8 @@ account_function( c_size_t, c_void_p, c_size_t ) + + class Account(object): def __init__(self): self.buf = create_string_buffer(lib.olm_account_size()) |