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) | |||
50 | find_package(XKBCommon REQUIRED) | 50 | find_package(XKBCommon REQUIRED) |
51 | find_package(GdkPixbuf REQUIRED) | 51 | find_package(GdkPixbuf REQUIRED) |
52 | 52 | ||
53 | include(Manpage) | ||
54 | |||
53 | include_directories(include) | 55 | include_directories(include) |
54 | 56 | ||
55 | add_subdirectory(protocols) | 57 | add_subdirectory(protocols) |
@@ -62,12 +64,6 @@ add_subdirectory(swaymsg) | |||
62 | add_subdirectory(swaygrab) | 64 | add_subdirectory(swaygrab) |
63 | add_subdirectory(swaybar) | 65 | add_subdirectory(swaybar) |
64 | 66 | ||
65 | include(Manpage) | ||
66 | add_manpage(sway 1) | ||
67 | add_manpage(sway 5) | ||
68 | add_manpage(swaymsg 1) | ||
69 | add_manpage(swaygrab 1) | ||
70 | |||
71 | install( | 67 | install( |
72 | FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop | 68 | FILES ${CMAKE_CURRENT_SOURCE_DIR}/sway.desktop |
73 | DESTINATION share/wayland-sessions | 69 | 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( | |||
46 | DESTINATION ${FALLBACK_CONFIG_DIR} | 46 | DESTINATION ${FALLBACK_CONFIG_DIR} |
47 | COMPONENT configuration | 47 | COMPONENT configuration |
48 | ) | 48 | ) |
49 | |||
50 | add_manpage(sway 1) | ||
51 | 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( | |||
13 | DESTINATION bin | 13 | DESTINATION bin |
14 | COMPONENT runtime | 14 | COMPONENT runtime |
15 | ) | 15 | ) |
16 | |||
17 | 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( | |||
12 | DESTINATION bin | 12 | DESTINATION bin |
13 | COMPONENT runtime | 13 | COMPONENT runtime |
14 | ) | 14 | ) |
15 | |||
16 | 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 @@ | |||
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include "wayland-desktop-shell-client-protocol.h" | 4 | #include "wayland-desktop-shell-client-protocol.h" |
5 | #include "client/registry.h" | 5 | #include "client/registry.h" |
6 | #include "stringop.h" | ||
6 | #include "log.h" | 7 | #include "log.h" |
7 | 8 | ||
8 | static void display_handle_mode(void *data, struct wl_output *wl_output, | 9 | static void display_handle_mode(void *data, struct wl_output *wl_output, |
@@ -110,7 +111,6 @@ void registry_teardown(struct registry *registry) { | |||
110 | wl_display_disconnect(registry->display); | 111 | wl_display_disconnect(registry->display); |
111 | } | 112 | } |
112 | if (registry->outputs) { | 113 | if (registry->outputs) { |
113 | // TODO: Free the outputs themselves | 114 | free_flat_list(registry->outputs); |
114 | list_free(registry->outputs); | ||
115 | } | 115 | } |
116 | } | 116 | } |