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) { ws->is_focused = true; free(ws_name); - + return output; } @@ -354,7 +354,7 @@ swayc_t *destroy_workspace(swayc_t *workspace) { if (!ASSERT_NONNULL(workspace)) { return NULL; } - + // Do not destroy this if it's the last workspace on this output swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT); 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) { if (!bar_id) { sway_abort("No bar_id passed. Provide --bar_id or let sway start swaybar"); } - + if (debug) { init_log(L_DEBUG); } 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 ) if (WITH_GDK_PIXBUF) - include_directories( - ${GDK_PIXBUF_INCLUDE_DIRS} - ) - target_link_libraries(swaybg - ${GDK_PIXBUF_LIBRARIES} - ) + include_directories( + ${GDK_PIXBUF_INCLUDE_DIRS} + ) + target_link_libraries(swaybg + ${GDK_PIXBUF_LIBRARIES} + ) endif() 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, "-video_size %dx%d -pixel_format argb " "-i pipe:0 -r %d -vf vflip %s"; char *cmd = malloc(strlen(fmt) - 8 /*args*/ - + numlen(width) + numlen(height) + numlen(framerate) * 2 + + numlen(width) + numlen(height) + numlen(framerate) * 2 + strlen(file) + 1); sprintf(cmd, fmt, framerate, width, height, framerate, file); 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 ) if (WITH_GDK_PIXBUF) - include_directories( - ${GDK_PIXBUF_INCLUDE_DIRS} - ) - target_link_libraries(swaylock - ${GDK_PIXBUF_LIBRARIES} - ) + include_directories( + ${GDK_PIXBUF_INCLUDE_DIRS} + ) + target_link_libraries(swaylock + ${GDK_PIXBUF_LIBRARIES} + ) endif() 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; struct pam_response *pam_reply; int function_conversation(int num_msg, const struct pam_message **msg, - struct pam_response **resp, void *appdata_ptr) { + struct pam_response **resp, void *appdata_ptr) { *resp = pam_reply; - return PAM_SUCCESS; -} + return PAM_SUCCESS; +} /** * password will be zeroed out. @@ -122,7 +122,7 @@ int main(int argc, char **argv) { cairo_surface_t *image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf); g_object_unref(pixbuf); #else - cairo_surface_t *image = cairo_image_surface_create_from_png(argv[1]); + cairo_surface_t *image = cairo_image_surface_create_from_png(argv[1]); #endif //WITH_GDK_PIXBUF if (!image) { sway_abort("Failed to read background image."); |