[gnome-online-accounts/wip/rishi/daemon-drop-no-sigint] daemon: Remove the --no-sigint flag and always handle SIGINT



commit c5ddb09478ec2ef5dcba648f1d2d8b094e1209b9
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Jun 17 12:19:40 2020 +0200

    daemon: Remove the --no-sigint flag and always handle SIGINT
    
    The --no-sigint flag is not documented in the goa-daemon(8) manual, and
    there's no real reason to not handle SIGINT for a controlled shutdown.
    
    https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/52

 src/daemon/main.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 28c7a0fb..e4554daf 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * Copyright © 2011 – 2017 Red Hat, Inc.
+ * Copyright © 2011 – 2020 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -31,11 +31,9 @@
 
 static GMainLoop *loop = NULL;
 static gboolean opt_replace = FALSE;
-static gboolean opt_no_sigint = FALSE;
 static GOptionEntry opt_entries[] =
 {
   {"replace", 0, 0, G_OPTION_ARG_NONE, &opt_replace, "Replace existing daemon", NULL},
-  {"no-sigint", 0, 0, G_OPTION_ARG_NONE, &opt_no_sigint, "Do not handle SIGINT for controlled shutdown", 
NULL},
   {NULL }
 };
 static GoaDaemon *the_daemon = NULL;
@@ -110,11 +108,7 @@ main (int    argc,
   g_message ("goa-daemon version %s starting", PACKAGE_VERSION);
 
   loop = g_main_loop_new (NULL, FALSE);
-
-  if (!opt_no_sigint)
-    {
-      g_unix_signal_add (SIGINT, on_sigint, NULL);
-    }
+  g_unix_signal_add (SIGINT, on_sigint, NULL);
 
   name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
                                   "org.gnome.OnlineAccounts",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]