diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | sway/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sway/sway.1.txt (renamed from sway.1.txt) | 0 | ||||
| -rw-r--r-- | sway/sway.5.txt (renamed from sway.5.txt) | 0 | ||||
| -rw-r--r-- | swaygrab/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | swaygrab/swaygrab.1.txt (renamed from swaygrab.1.txt) | 0 | ||||
| -rw-r--r-- | swaymsg/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | swaymsg/swaymsg.1.txt (renamed from swaymsg.1.txt) | 0 | ||||
| -rw-r--r-- | wayland/registry.c | 4 |
9 files changed, 11 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 29c85fb4..3972e730 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,8 @@ find_package(Wayland REQUIRED) find_package(XKBCommon REQUIRED) find_package(GdkPixbuf REQUIRED) +include(Manpage) + include_directories(include) add_subdirectory(protocols) @@ -62,12 +64,6 @@ add_subdirectory(swaymsg) add_subdirectory(swaygrab) add_subdirectory(swaybar) -include(Manpage) -add_manpage(sway 1) -add_manpage(sway 5) -add_manpage(swaymsg 1) -add_manpage(swaygrab 1) - install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop DESTINATION share/wayland-sessions diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 49ed24e7..aa553492 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt @@ -46,3 +46,6 @@ install( DESTINATION ${FALLBACK_CONFIG_DIR} COMPONENT configuration ) + +add_manpage(sway 1) +add_manpage(sway 5) diff --git a/sway.1.txt b/sway/sway.1.txt index 402b2d77..402b2d77 100644 --- a/sway.1.txt +++ b/sway/sway.1.txt diff --git a/sway.5.txt b/sway/sway.5.txt index 24467d22..24467d22 100644 --- a/sway.5.txt +++ b/sway/sway.5.txt diff --git a/swaygrab/CMakeLists.txt b/swaygrab/CMakeLists.txt index d5468cda..f664c01d 100644 --- a/swaygrab/CMakeLists.txt +++ b/swaygrab/CMakeLists.txt @@ -13,3 +13,5 @@ install( DESTINATION bin COMPONENT runtime ) + +add_manpage(swaygrab 1) diff --git a/swaygrab.1.txt b/swaygrab/swaygrab.1.txt index cd4b8bd2..cd4b8bd2 100644 --- a/swaygrab.1.txt +++ b/swaygrab/swaygrab.1.txt diff --git a/swaymsg/CMakeLists.txt b/swaymsg/CMakeLists.txt index 2481b280..06939991 100644 --- a/swaymsg/CMakeLists.txt +++ b/swaymsg/CMakeLists.txt @@ -12,3 +12,5 @@ install( DESTINATION bin COMPONENT runtime ) + +add_manpage(swaymsg 1) diff --git a/swaymsg.1.txt b/swaymsg/swaymsg.1.txt index 984780fa..984780fa 100644 --- a/swaymsg.1.txt +++ b/swaymsg/swaymsg.1.txt diff --git a/wayland/registry.c b/wayland/registry.c index a7eb89d1..3c869d25 100644 --- a/wayland/registry.c +++ b/wayland/registry.c @@ -3,6 +3,7 @@ #include <string.h> #include "wayland-desktop-shell-client-protocol.h" #include "client/registry.h" +#include "stringop.h" #include "log.h" static void display_handle_mode(void *data, struct wl_output *wl_output, @@ -110,7 +111,6 @@ void registry_teardown(struct registry *registry) { wl_display_disconnect(registry->display); } if (registry->outputs) { - // TODO: Free the outputs themselves - list_free(registry->outputs); + free_flat_list(registry->outputs); } } |