Skip to content

Commit

Permalink
gitmodules: Update libnkutils
Browse files Browse the repository at this point in the history
Signed-off-by: Quentin Glidic <[email protected]>
  • Loading branch information
sardemff7 committed Sep 25, 2023
1 parent b5f1e97 commit 1243dca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 0 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ config_h = configure_file(output: 'config.h', configuration: header_conf)

nk_options = [
'bindings=true',
'xdg-theme=true',
'git-work-tree=@0@'.format(meson.source_root()),
]
nk = subproject('libnkutils', default_options: nk_options)
Expand Down
8 changes: 6 additions & 2 deletions source/keyb.c
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,9 @@ gboolean parse_keys_abe(NkBindings *bindings) {
entry = strtok_r(NULL, sep, &sp)) {
if (!nk_bindings_add_binding(bindings, b->scope, entry,
binding_check_action, binding_trigger_action,
GUINT_TO_POINTER(b->id), NULL, &error)) {
GUINT_TO_POINTER(b->id), NULL,
NK_BINDINGS_ADD_FLAG_NONE,
&error)) {
if (error->code == NK_BINDINGS_ERROR_ALREADY_REGISTERED &&
error->domain == NK_BINDINGS_ERROR) {
char *str = g_markup_printf_escaped(
Expand Down Expand Up @@ -485,7 +487,9 @@ gboolean parse_keys_abe(NkBindings *bindings) {
for (gsize j = 1; j < G_N_ELEMENTS(mouse_default_bindings); ++j) {
nk_bindings_add_binding(bindings, i, mouse_default_bindings[j],
binding_check_action, binding_trigger_action,
GSIZE_TO_POINTER(j), NULL, NULL);
GSIZE_TO_POINTER(j), NULL,
NK_BINDINGS_ADD_FLAG_NONE,
NULL);
}
}

Expand Down
2 changes: 1 addition & 1 deletion subprojects/libnkutils
Submodule libnkutils updated 46 files
+6 −1 bindings/include/nkutils-bindings.h
+38 −0 bindings/meson.build
+11 −2 bindings/src/bindings.c
+21 −1 bindings/tests/bindings.c
+2 −2 configure.ac
+0 −0 core/include/nkutils-colour.h
+0 −0 core/include/nkutils-enum.h
+0 −0 core/include/nkutils-format-string.h
+0 −0 core/include/nkutils-gtk-settings.h
+0 −0 core/include/nkutils-xdg-de.h
+0 −0 core/include/nkutils-xdg-theme.h
+135 −0 core/meson.build
+0 −0 core/src/colour.c
+0 −0 core/src/enum.c
+0 −0 core/src/format-string-example.c
+0 −0 core/src/format-string.c
+0 −0 core/src/git-version.c
+0 −0 core/src/gtk-settings.c
+0 −0 core/src/xdg-de.c
+0 −0 core/src/xdg-theme-example.c
+0 −0 core/src/xdg-theme.c
+0 −0 core/tests/colour.c
+0 −0 core/tests/enum.c
+0 −0 core/tests/format-string.c
+0 −0 core/tests/gtk-3.0/settings.ini
+0 −0 core/tests/gtk-4.0/settings.ini
+0 −0 core/tests/gtk-settings.c
+0 −0 core/tests/home/.icons/test-icon-home-icons.png
+0 −0 core/tests/icons/recursive-theme-test/index.theme
+0 −0 core/tests/icons/recursive-theme-test/test-dir/test-icon.svg
+0 −0 core/tests/xdg-de.c
+0 −0 core/tests/xdg-theme.c
+0 −0 doc/libnkutils-man.xml
+60 −0 doc/meson.build
+77 −73 libnkutils-common.mk
+41 −191 meson.build
+0 −6 meson_options.txt
+0 −0 uuid/include/nkutils-uuid.h
+64 −0 uuid/meson.build
+0 −0 uuid/src/uuid-apr-util.c
+0 −0 uuid/src/uuid-internal.h
+0 −0 uuid/src/uuid-libsystemd.c
+0 −0 uuid/src/uuid-libuuid.c
+0 −0 uuid/src/uuid-nosystemd.c
+0 −0 uuid/src/uuid.c
+0 −0 uuid/tests/uuid.c

0 comments on commit 1243dca

Please sign in to comment.