diff options
-rw-r--r-- | sway/container.c | 4 | ||||
-rw-r--r-- | swaybar/main.c | 2 | ||||
-rw-r--r-- | swaybg/CMakeLists.txt | 12 | ||||
-rw-r--r-- | swaygrab/main.c | 2 | ||||
-rw-r--r-- | swaylock/CMakeLists.txt | 12 | ||||
-rw-r--r-- | swaylock/main.c | 8 |
6 files changed, 20 insertions, 20 deletions
diff --git a/sway/container.c b/sway/container.c index dcf4dcc8..63374f9e 100644 --- a/sway/container.c +++ b/sway/container.c | |||
@@ -149,7 +149,7 @@ swayc_t *new_output(wlc_handle handle) { | |||
149 | ws->is_focused = true; | 149 | ws->is_focused = true; |
150 | 150 | ||
151 | free(ws_name); | 151 | free(ws_name); |
152 | 152 | ||
153 | return output; | 153 | return output; |
154 | } | 154 | } |
155 | 155 | ||
@@ -354,7 +354,7 @@ swayc_t *destroy_workspace(swayc_t *workspace) { | |||
354 | if (!ASSERT_NONNULL(workspace)) { | 354 | if (!ASSERT_NONNULL(workspace)) { |
355 | return NULL; | 355 | return NULL; |
356 | } | 356 | } |
357 | 357 | ||
358 | // Do not destroy this if it's the last workspace on this output | 358 | // Do not destroy this if it's the last workspace on this output |
359 | swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT); | 359 | swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT); |
360 | if (output && output->children->length == 1) { | 360 | if (output && output->children->length == 1) { |
diff --git a/swaybar/main.c b/swaybar/main.c index e3967846..98b75aee 100644 --- a/swaybar/main.c +++ b/swaybar/main.c | |||
@@ -1231,7 +1231,7 @@ int main(int argc, char **argv) { | |||
1231 | if (!bar_id) { | 1231 | if (!bar_id) { |
1232 | sway_abort("No bar_id passed. Provide --bar_id or let sway start swaybar"); | 1232 | sway_abort("No bar_id passed. Provide --bar_id or let sway start swaybar"); |
1233 | } | 1233 | } |
1234 | 1234 | ||
1235 | if (debug) { | 1235 | if (debug) { |
1236 | init_log(L_DEBUG); | 1236 | init_log(L_DEBUG); |
1237 | } else { | 1237 | } else { |
diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 68098370..c5efae91 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt | |||
@@ -20,12 +20,12 @@ target_link_libraries(swaybg | |||
20 | ) | 20 | ) |
21 | 21 | ||
22 | if (WITH_GDK_PIXBUF) | 22 | if (WITH_GDK_PIXBUF) |
23 | include_directories( | 23 | include_directories( |
24 | ${GDK_PIXBUF_INCLUDE_DIRS} | 24 | ${GDK_PIXBUF_INCLUDE_DIRS} |
25 | ) | 25 | ) |
26 | target_link_libraries(swaybg | 26 | target_link_libraries(swaybg |
27 | ${GDK_PIXBUF_LIBRARIES} | 27 | ${GDK_PIXBUF_LIBRARIES} |
28 | ) | 28 | ) |
29 | endif() | 29 | endif() |
30 | 30 | ||
31 | install( | 31 | install( |
diff --git a/swaygrab/main.c b/swaygrab/main.c index d64d2ff2..403f7b38 100644 --- a/swaygrab/main.c +++ b/swaygrab/main.c | |||
@@ -72,7 +72,7 @@ void grab_and_apply_movie_magic(const char *file, const char *output, | |||
72 | "-video_size %dx%d -pixel_format argb " | 72 | "-video_size %dx%d -pixel_format argb " |
73 | "-i pipe:0 -r %d -vf vflip %s"; | 73 | "-i pipe:0 -r %d -vf vflip %s"; |
74 | char *cmd = malloc(strlen(fmt) - 8 /*args*/ | 74 | char *cmd = malloc(strlen(fmt) - 8 /*args*/ |
75 | + numlen(width) + numlen(height) + numlen(framerate) * 2 | 75 | + numlen(width) + numlen(height) + numlen(framerate) * 2 |
76 | + strlen(file) + 1); | 76 | + strlen(file) + 1); |
77 | sprintf(cmd, fmt, framerate, width, height, framerate, file); | 77 | sprintf(cmd, fmt, framerate, width, height, framerate, file); |
78 | 78 | ||
diff --git a/swaylock/CMakeLists.txt b/swaylock/CMakeLists.txt index 6b110e77..ff76cdbc 100644 --- a/swaylock/CMakeLists.txt +++ b/swaylock/CMakeLists.txt | |||
@@ -22,12 +22,12 @@ target_link_libraries(swaylock | |||
22 | ) | 22 | ) |
23 | 23 | ||
24 | if (WITH_GDK_PIXBUF) | 24 | if (WITH_GDK_PIXBUF) |
25 | include_directories( | 25 | include_directories( |
26 | ${GDK_PIXBUF_INCLUDE_DIRS} | 26 | ${GDK_PIXBUF_INCLUDE_DIRS} |
27 | ) | 27 | ) |
28 | target_link_libraries(swaylock | 28 | target_link_libraries(swaylock |
29 | ${GDK_PIXBUF_LIBRARIES} | 29 | ${GDK_PIXBUF_LIBRARIES} |
30 | ) | 30 | ) |
31 | endif() | 31 | endif() |
32 | 32 | ||
33 | install( | 33 | install( |
diff --git a/swaylock/main.c b/swaylock/main.c index eccb902e..9de95e7a 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
@@ -38,10 +38,10 @@ char *password; | |||
38 | struct pam_response *pam_reply; | 38 | struct pam_response *pam_reply; |
39 | 39 | ||
40 | int function_conversation(int num_msg, const struct pam_message **msg, | 40 | int function_conversation(int num_msg, const struct pam_message **msg, |
41 | struct pam_response **resp, void *appdata_ptr) { | 41 | struct pam_response **resp, void *appdata_ptr) { |
42 | *resp = pam_reply; | 42 | *resp = pam_reply; |
43 | return PAM_SUCCESS; | 43 | return PAM_SUCCESS; |
44 | } | 44 | } |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * password will be zeroed out. | 47 | * password will be zeroed out. |
@@ -122,7 +122,7 @@ int main(int argc, char **argv) { | |||
122 | cairo_surface_t *image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf); | 122 | cairo_surface_t *image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf); |
123 | g_object_unref(pixbuf); | 123 | g_object_unref(pixbuf); |
124 | #else | 124 | #else |
125 | cairo_surface_t *image = cairo_image_surface_create_from_png(argv[1]); | 125 | cairo_surface_t *image = cairo_image_surface_create_from_png(argv[1]); |
126 | #endif //WITH_GDK_PIXBUF | 126 | #endif //WITH_GDK_PIXBUF |
127 | if (!image) { | 127 | if (!image) { |
128 | sway_abort("Failed to read background image."); | 128 | sway_abort("Failed to read background image."); |