From 8abb7a04dcd08078662b95a26bf4dd5e15f1a2f2 Mon Sep 17 00:00:00 2001 From: idillon Date: Wed, 12 Oct 2022 15:59:25 -0400 Subject: [PATCH] nodejs: fix libjami linking and ConversationPreferencesUpdated binding Change-Id: I3a444c818210fbdb3c5873fea63fc75af5101b44 --- bin/nodejs/binding.gyp | 2 +- bin/nodejs/nodejs_interface.i | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/nodejs/binding.gyp b/bin/nodejs/binding.gyp index 8b323870d..7e2f7d87b 100644 --- a/bin/nodejs/binding.gyp +++ b/bin/nodejs/binding.gyp @@ -4,7 +4,7 @@ "target_name": "jamid", "sources": [ "jami_wrapper.cpp" ], 'include_dirs': ['../../src/'], - 'libraries': ['-L<(module_root_dir)/../../src/.libs', '-lring'], + 'libraries': ['-L<(module_root_dir)/../../src/.libs', '-ljami'], 'cflags!': [ '-fno-exceptions' ], 'cflags_cc!': [ '-fno-exceptions', '-fno-rtti', '-std=gnu++1y' ], 'cflags_cc': [ '-std=gnu++17' ] diff --git a/bin/nodejs/nodejs_interface.i b/bin/nodejs/nodejs_interface.i index 8da4ace3f..fb4a2c9a0 100644 --- a/bin/nodejs/nodejs_interface.i +++ b/bin/nodejs/nodejs_interface.i @@ -156,7 +156,7 @@ void init(const SWIGV8_VALUE& funcMap){ exportable_callback(bind(&conversationRemoved, _1, _2)), exportable_callback(bind(&conversationMemberEvent, _1, _2, _3, _4)), exportable_callback(bind(&onConversationError, _1, _2, _3, _4)), - exportable_callback(bind(&ConversationCallback::conversationPreferencesUpdated, convM, _1, _2, _3)) + exportable_callback(bind(&conversationPreferencesUpdated, _1, _2, _3)) }; if (!DRing::init(static_cast(DRing::DRING_FLAG_DEBUG)))