[network-manager-openswan/dcbw/cleanups: 27/27] core: simplify quit signal handling



commit 0d6de231a10e343edfbdfb06edebe370bd66ceb7
Author: Dan Williams <dcbw redhat com>
Date:   Thu Oct 2 14:07:42 2014 -0500

    core: simplify quit signal handling

 src/nm-openswan-service.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/src/nm-openswan-service.c b/src/nm-openswan-service.c
index a35e4d7..a0421a9 100644
--- a/src/nm-openswan-service.c
+++ b/src/nm-openswan-service.c
@@ -1160,12 +1160,6 @@ setup_signals (void)
        sigaction (SIGINT,  &action, NULL);
 }
 
-static void
-quit_mainloop (NMOpenSwanPlugin *plugin, gpointer user_data)
-{
-       g_main_loop_quit ((GMainLoop *) user_data);
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -1218,7 +1212,7 @@ main (int argc, char *argv[])
        loop = g_main_loop_new (NULL, FALSE);
 
        if (!persist)
-               g_signal_connect (plugin, "quit", G_CALLBACK (quit_mainloop), loop);
+               g_signal_connect_swapped (plugin, "quit", G_CALLBACK (g_main_loop_quit), loop);
 
        setup_signals ();
        g_main_loop_run (loop);


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