nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3420 from orestisf1993/sncontext==NULL-3419 

i3-nagbar & i3-config-wizard: check sncontext != NULL
This commit is contained in:
Ingo Bürk 2018-09-23 20:12:16 +02:00 committed by GitHub
parent ac88d06632 d080f58299
commit bec227236b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
i3-config-wizard/main.c
View File

@ -853,6 +853,7 @@ int main(int argc, char *argv[]) {
/* Init startup notification. */ /* Init startup notification. */
SnDisplay *sndisplay = sn_xcb_display_new(conn, NULL, NULL); SnDisplay *sndisplay = sn_xcb_display_new(conn, NULL, NULL);
SnLauncheeContext *sncontext = sn_launchee_context_new_from_environment(sndisplay, screen); SnLauncheeContext *sncontext = sn_launchee_context_new_from_environment(sndisplay, screen);
sn_display_unref(sndisplay);
root_screen = xcb_aux_get_screen(conn, screen); root_screen = xcb_aux_get_screen(conn, screen);
root = root_screen->root; root = root_screen->root;
@ -886,7 +887,9 @@ int main(int argc, char *argv[]) {
0, /* back pixel: black */ 0, /* back pixel: black */
XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_EXPOSURE |
XCB_EVENT_MASK_BUTTON_PRESS}); XCB_EVENT_MASK_BUTTON_PRESS});
if (sncontext) {
sn_launchee_context_setup_window(sncontext, win); sn_launchee_context_setup_window(sncontext, win);
}
/* Map the window (make it visible) */ /* Map the window (make it visible) */
xcb_map_window(conn, win); xcb_map_window(conn, win);
@ -949,9 +952,10 @@ int main(int argc, char *argv[]) {
} }
/* Startup complete. */ /* Startup complete. */
if (sncontext) {
sn_launchee_context_complete(sncontext); sn_launchee_context_complete(sncontext);
sn_launchee_context_unref(sncontext); sn_launchee_context_unref(sncontext);
sn_display_unref(sndisplay); }
xcb_flush(conn); xcb_flush(conn);

6
i3-nagbar/main.c
View File

@ -421,6 +421,7 @@ int main(int argc, char *argv[]) {
/* Init startup notification. */ /* Init startup notification. */
SnDisplay *sndisplay = sn_xcb_display_new(conn, NULL, NULL); SnDisplay *sndisplay = sn_xcb_display_new(conn, NULL, NULL);
SnLauncheeContext *sncontext = sn_launchee_context_new_from_environment(sndisplay, screens); SnLauncheeContext *sncontext = sn_launchee_context_new_from_environment(sndisplay, screens);
sn_display_unref(sndisplay);
root_screen = xcb_aux_get_screen(conn, screens); root_screen = xcb_aux_get_screen(conn, screens);
root = root_screen->root; root = root_screen->root;
@ -491,7 +492,9 @@ int main(int argc, char *argv[]) {
XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_PRESS |
XCB_EVENT_MASK_BUTTON_RELEASE, XCB_EVENT_MASK_BUTTON_RELEASE,
cursor}); cursor});
if (sncontext) {
sn_launchee_context_setup_window(sncontext, win); sn_launchee_context_setup_window(sncontext, win);
}
/* Map the window (make it visible) */ /* Map the window (make it visible) */
xcb_map_window(conn, win); xcb_map_window(conn, win);
@ -553,9 +556,10 @@ int main(int argc, char *argv[]) {
draw_util_surface_init(conn, &bar, win, get_visualtype(root_screen), win_pos.width, win_pos.height); draw_util_surface_init(conn, &bar, win, get_visualtype(root_screen), win_pos.width, win_pos.height);
/* Startup complete. */ /* Startup complete. */
if (sncontext) {
sn_launchee_context_complete(sncontext); sn_launchee_context_complete(sncontext);
sn_launchee_context_unref(sncontext); sn_launchee_context_unref(sncontext);
sn_display_unref(sndisplay); }
/* Grab the keyboard to get all input */ /* Grab the keyboard to get all input */
xcb_flush(conn); xcb_flush(conn);