Fix: call acting component's "port disconnected" method too

[babeltrace.git] / lib / component / component.c

diff --git a/lib/component/component.c b/lib/component/component.c
index 456175ff5d33eb8197e4d256173c09e5c91f4ef0..47f83c861d3a17b69eb9ca3669a6472b61f85b63 100644 (file)
--- a/lib/component/component.c
+++ b/lib/component/component.c
@@ -26,18 +26,18 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/component/private-component.h>
-#include <babeltrace/component/component.h>
-#include <babeltrace/component/component-internal.h>
-#include <babeltrace/component/component-class-internal.h>
-#include <babeltrace/component/component-source-internal.h>
-#include <babeltrace/component/component-filter-internal.h>
-#include <babeltrace/component/component-sink-internal.h>
-#include <babeltrace/component/private-connection.h>
-#include <babeltrace/component/connection-internal.h>
-#include <babeltrace/component/graph-internal.h>
-#include <babeltrace/component/notification/iterator-internal.h>
-#include <babeltrace/component/notification/private-iterator.h>
+#include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/component.h>
+#include <babeltrace/graph/component-internal.h>
+#include <babeltrace/graph/component-class-internal.h>
+#include <babeltrace/graph/component-source-internal.h>
+#include <babeltrace/graph/component-filter-internal.h>
+#include <babeltrace/graph/component-sink-internal.h>
+#include <babeltrace/graph/private-connection.h>
+#include <babeltrace/graph/connection-internal.h>
+#include <babeltrace/graph/graph-internal.h>
+#include <babeltrace/graph/notification-iterator-internal.h>
+#include <babeltrace/graph/private-notification-iterator.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/ref.h>
@@ -82,8 +82,8 @@ void bt_component_destroy(struct bt_object *obj)
         * User data is destroyed first, followed by the concrete component
         * instance.
         */
-       if (component->class->methods.destroy) {
-               component->class->methods.destroy(
+       if (component->class->methods.finalize) {
+               component->class->methods.finalize(
                        bt_private_component_from_component(component));
        }
 
@@ -477,7 +477,7 @@ void bt_component_remove_port_at_index(struct bt_component *component,
 
        /* Disconnect both ports of this port's connection, if any */
        if (port->connection) {
-               bt_connection_disconnect_ports(port->connection, component);
+               bt_connection_disconnect_ports(port->connection);
        }
 
        /* Remove from parent's array of ports (weak refs) */