Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
'LIB_EXPAT=expat'
],
'cflags': [
'-Wno-unused-result',
'-std=gnu++0x',
'<!@(pkg-config --cflags dbus-1)'
],
Expand Down
2 changes: 2 additions & 0 deletions deps/libexpat/libexpat.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
'HAVE_EXPAT_CONFIG_H'
],
'cflags': [
'-Wno-implicit-fallthrough',
'-Wno-unused-but-set-variable',
'-Wno-missing-field-initializers'
],
'xcode_settings': {
Expand Down
7 changes: 4 additions & 3 deletions src/object_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ static DBusHandlerResult MessageHandler(DBusConnection* connection,
if (!dbus_message_get_no_reply(message)) dbus_message_ref(message);

// Invoke
Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(handler), 7,
info);
Nan::AsyncResource asyncCB("message-handler");
asyncCB.runInAsyncScope(Nan::GetCurrentContext()->Global(), Nan::New(handler),
7, info);

return DBUS_HANDLER_RESULT_HANDLED;
}
Expand Down Expand Up @@ -115,7 +116,7 @@ NAN_METHOD(RegisterObjectPath) {
// Register object path
char* object_path = strdup(*Nan::Utf8String(info[1]));
dbus_error_init(&error);
dbus_bool_t ret = dbus_connection_try_register_object_path(
dbus_connection_try_register_object_path(
bus->connection, object_path, &vtable, nullptr, &error);
dbus_connection_flush(bus->connection);
dbus_free(object_path);
Expand Down
5 changes: 3 additions & 2 deletions src/signal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ void DispatchSignal(Local<Value> info[]) {
if (!hookSignal) return;

// MakeCallback(handler, handler, 6, info);
Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(handler), 6,
info);
Nan::AsyncResource asyncCB("signal-handler");
asyncCB.runInAsyncScope(Nan::GetCurrentContext()->Global(), Nan::New(handler),
6, info);
}

NAN_METHOD(SetSignalHandler) {
Expand Down