From ea7c1ceeb3ed9469272567292979c2193eb15699 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Wed, 9 Apr 2008 12:56:52 +0200 Subject: [PATCH] [ewmh/awesome] Comsmetics Signed-off-by: Julien Danjou --- awesome.c | 13 ++++++++----- ewmh.c | 5 ++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/awesome.c b/awesome.c index a5c85205d..b4b61a411 100644 --- a/awesome.c +++ b/awesome.c @@ -407,8 +407,8 @@ main(int argc, char **argv) { /* view at least one tag */ tag_view(globalconf.screens[screen_nbr].tags, true); - - for(statusbar = globalconf.screens[screen_nbr].statusbar; statusbar; statusbar = statusbar->next) + for(statusbar = globalconf.screens[screen_nbr].statusbar; + statusbar; statusbar = statusbar->next) statusbar_init(statusbar); } @@ -458,13 +458,16 @@ main(int argc, char **argv) /* check for shape extension */ shape_query = xcb_get_extension_data(globalconf.connection, &xcb_shape_id); if((globalconf.have_shape = shape_query->present)) - xcb_set_event_handler(globalconf.evenths, (shape_query->first_event + XCB_SHAPE_NOTIFY), - (xcb_generic_event_handler_t) event_handle_shape, NULL); + xcb_set_event_handler(globalconf.evenths, + (shape_query->first_event + XCB_SHAPE_NOTIFY), + (xcb_generic_event_handler_t) event_handle_shape, + NULL); /* check for randr extension */ randr_query = xcb_get_extension_data(globalconf.connection, &xcb_randr_id); if((globalconf.have_randr = randr_query->present)) - xcb_set_event_handler(globalconf.evenths, (randr_query->first_event + XCB_RANDR_SCREEN_CHANGE_NOTIFY), + xcb_set_event_handler(globalconf.evenths, + (randr_query->first_event + XCB_RANDR_SCREEN_CHANGE_NOTIFY), (xcb_generic_event_handler_t) event_handle_randr_screen_change_notify, NULL); diff --git a/ewmh.c b/ewmh.c index d3042f0c2..fcb3d87ad 100644 --- a/ewmh.c +++ b/ewmh.c @@ -117,8 +117,7 @@ ewmh_init_atoms(void) for(i = 0; i < ATOM_NUMBER; i++) { - r = xcb_intern_atom_reply(globalconf.connection, cs[i], NULL); - if(!r) + if(!(r = xcb_intern_atom_reply(globalconf.connection, cs[i], NULL))) /* An error occured, get reply for next atom */ continue; @@ -435,7 +434,7 @@ ewmh_get_window_icon(xcb_window_t w) xcb_get_property_unchecked(globalconf.connection, false, w, net_wm_icon, CARDINAL, 0, UINT32_MAX), NULL); - if(!r || r->type != CARDINAL || r->format != 32 || r->length < 2 || + if(!r || r->type != CARDINAL || r->format != 32 || r->length < 2 || !(data = (uint32_t *) xcb_get_property_value(r))) { if(r)