mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-27 23:47:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix whitespace issues.

Browse source
This commit is contained in:
Mikkel Oscar Lyderik 2016-01-05 23:42:40 +01:00
parent 2e0ef533f2
commit 364e37a1eb
6 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/container.c
View file

@ -149,7 +149,7 @@ swayc_t *new_output(wlc_handle handle) {
ws->is_focused = true; ws->is_focused = true;
free(ws_name); free(ws_name);
return output; return output;
} }
@ -354,7 +354,7 @@ swayc_t *destroy_workspace(swayc_t *workspace) {
if (!ASSERT_NONNULL(workspace)) { if (!ASSERT_NONNULL(workspace)) {
return NULL; return NULL;
} }
// Do not destroy this if it's the last workspace on this output // Do not destroy this if it's the last workspace on this output
swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT); swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT);
if (output && output->children->length == 1) { if (output && output->children->length == 1) {

2
swaybar/main.c
View file

@ -1231,7 +1231,7 @@ int main(int argc, char **argv) {
if (!bar_id) { if (!bar_id) {
sway_abort("No bar_id passed. Provide --bar_id or let sway start swaybar"); sway_abort("No bar_id passed. Provide --bar_id or let sway start swaybar");
} }
if (debug) { if (debug) {
init_log(L_DEBUG); init_log(L_DEBUG);
} else { } else {

12
swaybg/CMakeLists.txt
View file

@ -20,12 +20,12 @@ target_link_libraries(swaybg
) )
if (WITH_GDK_PIXBUF) if (WITH_GDK_PIXBUF)
include_directories( include_directories(
${GDK_PIXBUF_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS}
) )
target_link_libraries(swaybg target_link_libraries(swaybg
${GDK_PIXBUF_LIBRARIES} ${GDK_PIXBUF_LIBRARIES}
) )
endif() endif()
install( install(

2
swaygrab/main.c
View file

@ -72,7 +72,7 @@ void grab_and_apply_movie_magic(const char *file, const char *output,
"-video_size %dx%d -pixel_format argb " "-video_size %dx%d -pixel_format argb "
"-i pipe:0 -r %d -vf vflip %s"; "-i pipe:0 -r %d -vf vflip %s";
char *cmd = malloc(strlen(fmt) - 8 /*args*/ char *cmd = malloc(strlen(fmt) - 8 /*args*/
+ numlen(width) + numlen(height) + numlen(framerate) * 2 + numlen(width) + numlen(height) + numlen(framerate) * 2
+ strlen(file) + 1); + strlen(file) + 1);
sprintf(cmd, fmt, framerate, width, height, framerate, file); sprintf(cmd, fmt, framerate, width, height, framerate, file);

12
swaylock/CMakeLists.txt
View file

@ -22,12 +22,12 @@ target_link_libraries(swaylock
) )
if (WITH_GDK_PIXBUF) if (WITH_GDK_PIXBUF)
include_directories( include_directories(
${GDK_PIXBUF_INCLUDE_DIRS} ${GDK_PIXBUF_INCLUDE_DIRS}
) )
target_link_libraries(swaylock target_link_libraries(swaylock
${GDK_PIXBUF_LIBRARIES} ${GDK_PIXBUF_LIBRARIES}
) )
endif() endif()
install( install(

8
swaylock/main.c
View file

@ -38,10 +38,10 @@ char *password;
struct pam_response *pam_reply; struct pam_response *pam_reply;
int function_conversation(int num_msg, const struct pam_message **msg, 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; *resp = pam_reply;
return PAM_SUCCESS; return PAM_SUCCESS;
} }
/** /**
* password will be zeroed out. * 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); cairo_surface_t *image = gdk_cairo_image_surface_create_from_pixbuf(pixbuf);
g_object_unref(pixbuf); g_object_unref(pixbuf);
#else #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 #endif //WITH_GDK_PIXBUF
if (!image) { if (!image) {
sway_abort("Failed to read background image."); sway_abort("Failed to read background image.");