X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_trace.i;h=3448f646492cec8ef54060119e8a5e4cb7c1ef7d;hb=5084732e40a7925d22f741e4ed08f19d36078fbe;hp=8fcc5db9319371e2f8c1a1d6934d03eed30a1d44;hpb=d6bb425cb358e7b0db1873209e40a7d3cd7b5905;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt_trace.i b/src/bindings/python/bt2/bt2/native_bt_trace.i
index 8fcc5db9..3448f646 100644
--- a/src/bindings/python/bt2/bt2/native_bt_trace.i
+++ b/src/bindings/python/bt2/bt2/native_bt_trace.i
@@ -40,36 +40,34 @@ trace_destroyed_listener(const bt_trace *trace, void *py_callable)
 	}
 
 	py_res = PyObject_CallFunction(py_callable, "(O)", py_trace_ptr);
-	if (py_res != NULL) {
+	if (py_res) {
 		BT_ASSERT(py_res == Py_None);
 	} else {
-		bt2_py_loge_exception();
+		loge_exception();
 	}
 
 	Py_DECREF(py_trace_ptr);
 	Py_XDECREF(py_res);
 }
 
-uint64_t bt_py3_trace_add_destruction_listener(bt_trace *trace, PyObject *py_callable)
+uint64_t bt_bt2_trace_add_destruction_listener(bt_trace *trace, PyObject *py_callable)
 {
 	uint64_t id = UINT64_C(-1);
-	bt_trace_status status;
+	bt_trace_add_listener_status status;
 
 	BT_ASSERT(trace);
 	BT_ASSERT(py_callable);
-
 	status = bt_trace_add_destruction_listener(
 		trace, trace_destroyed_listener, py_callable, &id);
-	if (status != BT_TRACE_STATUS_OK) {
+	if (status != __BT_FUNC_STATUS_OK) {
 		BT_LOGF_STR("Failed to add trace destruction listener.");
 		abort();
 	}
 
 	Py_INCREF(py_callable);
-
 	return id;
 }
 %}
 
-uint64_t bt_py3_trace_add_destruction_listener(bt_trace *trace,
+uint64_t bt_bt2_trace_add_destruction_listener(bt_trace *trace,
 	PyObject *py_callable);