Merge pull request #3435 from vivien/i3-msg/subscribe

[i3/i3] / src / sighandler.c

diff --git a/src/sighandler.c b/src/sighandler.c
index 8ce0d9d7bf3e62de3fa77588c6563fa5dd80eb90..12ed0ef990dc7fc25bf15bb84f374d071d0c869a 100644 (file)
--- a/src/sighandler.c
+++ b/src/sighandler.c
@@ -98,7 +98,7 @@ static int sighandler_backtrace(void) {
 
         /* We provide pipe file descriptors for stdin/stdout because gdb < 7.5
          * crashes otherwise, see
-         * http://sourceware.org/bugzilla/show_bug.cgi?id=14114 */
+         * https://sourceware.org/bugzilla/show_bug.cgi?id=14114 */
         dup2(stdin_pipe[0], STDIN_FILENO);
         dup2(stdout_pipe[1], STDOUT_FILENO);
 
@@ -244,8 +244,8 @@ static void sighandler_draw_dialog(dialog_t *dialog) {
     const color_t red = draw_util_hex_to_color("#FF0000");
 
     /* Start with a clean slate and draw a red border. */
-    draw_util_clear_surface(conn, &(dialog->surface), red);
-    draw_util_rectangle(conn, &(dialog->surface), black, border_width, border_width,
+    draw_util_clear_surface(&(dialog->surface), red);
+    draw_util_rectangle(&(dialog->surface), black, border_width, border_width,
                         dialog->dims.width - 2 * border_width, dialog->dims.height - 2 * border_width);
 
     int y = border_width + margin;
@@ -305,6 +305,8 @@ void handle_signal(int sig, siginfo_t *info, void *data) {
 
     struct sigaction action;
     action.sa_handler = SIG_DFL;
+    action.sa_flags = 0;
+    sigemptyset(&action.sa_mask);
     sigaction(sig, &action, NULL);
     raised_signal = sig;