diff options
| author | Marja Hassinen <ext-marja.2.hassinen@nokia.com> | 2009-06-16 15:17:32 +0300 |
|---|---|---|
| committer | Marja Hassinen <ext-marja.2.hassinen@nokia.com> | 2009-06-16 15:17:32 +0300 |
| commit | e9c3a9ad843f92b77f731a3cce95e0e600eaa3f0 (patch) | |
| tree | c1bd6be84a35a5339c339277b412c14e08e92ddc /python | |
| parent | f1c4b4fcf1da20c6861496cde0b75a87bf82be0c (diff) | |
A fix: check the return value of libcontextprovider.init
and raise, if the return value was false.
Diffstat (limited to 'python')
| -rw-r--r-- | python/ContextKit/ContextProvider.py | 2 | ||||
| -rw-r--r-- | python/ContextKit/flexiprovider.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/python/ContextKit/ContextProvider.py b/python/ContextKit/ContextProvider.py index 2657bd27..d73025fa 100644 --- a/python/ContextKit/ContextProvider.py +++ b/python/ContextKit/ContextProvider.py @@ -11,7 +11,7 @@ except: class ContextProvider: SUBSCRIPTION_CHANGED_CALLBACK = CFUNCTYPE(None, c_int, c_void_p) - init = cfunc('context_provider_init', _dll, None, + init = cfunc('context_provider_init', _dll, c_int, ('bus_type', c_int, 1), ('bus_name', c_char_p, 1)) install_group = cfunc('context_provider_install_group', _dll, None, diff --git a/python/ContextKit/flexiprovider.py b/python/ContextKit/flexiprovider.py index 37c985f8..a75951c2 100644 --- a/python/ContextKit/flexiprovider.py +++ b/python/ContextKit/flexiprovider.py @@ -105,7 +105,9 @@ class Flexiprovider(object): DOUBLE=CP.ContextProvider.set_double, TRUTH=CP.ContextProvider.set_boolean) self.subscribed_cb = CP.ContextProvider.SUBSCRIPTION_CHANGED_CALLBACK(lambda x, y: None) - CP.ContextProvider.init(dict(session=0, system=1)[self.bus], self.busname) + retval = CP.ContextProvider.init(dict(session=0, system=1)[self.bus], self.busname) + if retval == 0: + raise Exception("libcontextprovider.init returned false") # Add properties and set the initial values. for p in properties: self.addproperty(p) |