aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorMarja Hassinen <ext-marja.2.hassinen@nokia.com>2009-02-05 15:23:20 +0200
committerMarja Hassinen <ext-marja.2.hassinen@nokia.com>2009-02-05 15:23:20 +0200
commitd287efbba1813e6bf85a6ccd2f7122ad8677ca6c (patch)
tree358592265c156ae72f252d6661ecbb4a88b6e816 /python
parent2f05be296a74c22f7b56f67f04d4978bb2d4ca87 (diff)
Fixing the callbacks in the python bindings. Adding more testcases.
Diffstat (limited to 'python')
-rw-r--r--python/ContextProvider.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/python/ContextProvider.py b/python/ContextProvider.py
index 2ea0879d..45d67df7 100644
--- a/python/ContextProvider.py
+++ b/python/ContextProvider.py
@@ -15,19 +15,20 @@ class PROVIDER(c_void_p):
class ContextProvider:
- GET_CALLBACK = CFUNCTYPE(STRING_SET, CHANGE_SET, c_void_p)
- SUBSCRIBE_CALLBACK = CFUNCTYPE(STRING_SET, c_void_p)
+ GET_CALLBACK = CFUNCTYPE(c_int, STRING_SET, CHANGE_SET, c_void_p)
+
+ SUBSCRIBE_CALLBACK = CFUNCTYPE(c_int, STRING_SET, c_void_p)
init = cfunc('context_provider_init', _dll, None,
('useSessionBus', c_int, 1),
('bus_name', c_char_p, 1))
install = cfunc('context_provider_install', _dll, PROVIDER,
('provided_keys', ListPOINTER (c_char_p), 1),
- ('get_cb', POINTER(GET_CALLBACK), 1),
+ ('get_cb', GET_CALLBACK, 1),
('get_cb_target', c_void_p, 1),
- ('first_cb', POINTER(SUBSCRIBE_CALLBACK), 1),
+ ('first_cb', SUBSCRIBE_CALLBACK, 1),
('first_cb_target', c_void_p, 1),
- ('last_cb', POINTER(SUBSCRIBE_CALLBACK), 1),
+ ('last_cb', SUBSCRIBE_CALLBACK, 1),
('last_cb_target', c_void_p, 1))
remove = cfunc('context_provider_remove', _dll, None,
('provider', PROVIDER, 1))
@@ -110,7 +111,9 @@ if __name__ == "__main__":
loop = gobject.MainLoop()
def get_cb (ss, cs, d):
- print StringSet.debug(ss)
+ print "This is get callback"
+ #print StringSet.debug(ss)
+ return 0
def first_cb (ss, d):
print StringSet.debug(ss)
def last_cb (ss, d):
@@ -129,5 +132,5 @@ if __name__ == "__main__":
ContextProvider.change_set_add_int(cs2, "foo.bar", 1)
ContextProvider.change_set_add_undetermined_key(cs2, "foo.baz")
ContextProvider.change_set_commit(cs2)
- ContextProvider.remove (p)
+ #ContextProvider.remove (p) # FIXME: Removed for testing purposes (now can be poked with d-feet)
loop.run()