]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
splash: drop SIGINT handlers
authorRay Strode <rstrode@redhat.com>
Fri, 8 Jun 2012 19:11:52 +0000 (15:11 -0400)
committerRay Strode <rstrode@redhat.com>
Fri, 8 Jun 2012 19:11:52 +0000 (15:11 -0400)
They serve no real purpose.

https://bugs.freedesktop.org/show_bug.cgi?id=42285

src/plugins/splash/fade-throbber/plugin.c
src/plugins/splash/script/plugin.c
src/plugins/splash/space-flares/plugin.c
src/plugins/splash/throbgress/plugin.c
src/plugins/splash/two-step/plugin.c

index 1b5363009e785488f56cbf50d7a34c799175ae8b..02a77ec4c8fea6712cbb5801921b59bc09e20502 100644 (file)
@@ -610,13 +610,6 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
   redraw_views (plugin);
 }
 
-static void
-on_interrupt (ply_boot_splash_plugin_t *plugin)
-{
-  ply_event_loop_exit (plugin->loop, 1);
-  stop_animation (plugin);
-}
-
 static void
 detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
 {
@@ -817,10 +810,6 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
   ply_event_loop_watch_for_exit (loop, (ply_event_loop_exit_handler_t)
                                  detach_from_event_loop,
                                  plugin);
-  ply_event_loop_watch_signal (plugin->loop,
-                               SIGINT,
-                               (ply_event_handler_t) 
-                               on_interrupt, plugin);
 
   if (!load_views (plugin))
     {
index f2fd2c7eae0823c9e0da0f487a072a8e035d9277..c5c1e16984ca2ce730ed9c9d2642b5ac64922675 100644 (file)
@@ -355,13 +355,6 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
   script_parse_op_free (plugin->script_main_op);
 }
 
-static void
-on_interrupt (ply_boot_splash_plugin_t *plugin)
-{
-  ply_event_loop_exit (plugin->loop, 1);
-  stop_animation (plugin);
-}
-
 static void
 detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
 {
@@ -432,11 +425,6 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
                                  detach_from_event_loop,
                                  plugin);
 
-  ply_event_loop_watch_signal (plugin->loop,
-                               SIGINT,
-                               (ply_event_handler_t)
-                               on_interrupt, plugin);
-
   ply_trace ("starting boot animation");
   return start_animation (plugin);
 }
index 88d5a464559803da19001e305a3a943c84c6c390..32412e0c03086b074be17bee5d17acd958778db7 100644 (file)
@@ -1262,13 +1262,6 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
     }
 }
 
-static void
-on_interrupt (ply_boot_splash_plugin_t *plugin)
-{
-  ply_event_loop_exit (plugin->loop, 1);
-  stop_animation (plugin);
-}
-
 static void
 detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
 {
@@ -1697,11 +1690,6 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
                                  detach_from_event_loop,
                                  plugin);
 
-  ply_event_loop_watch_signal (plugin->loop,
-                               SIGINT,
-                               (ply_event_handler_t) 
-                               on_interrupt, plugin);
-
   ply_trace ("starting boot animation");
 
   start_animation (plugin);
index 09cec0d663de4092d5d4727d966705023f2736b9..ee94261fd96e4bb80d7be8a3103f484166be8f20 100644 (file)
@@ -553,13 +553,6 @@ stop_animation (ply_boot_splash_plugin_t *plugin,
     ply_trigger_pull (trigger, NULL);
 }
 
-static void
-on_interrupt (ply_boot_splash_plugin_t *plugin)
-{
-  ply_event_loop_exit (plugin->loop, 1);
-  stop_animation (plugin, NULL);
-}
-
 static void
 detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
 {
@@ -682,11 +675,6 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
                                  detach_from_event_loop,
                                  plugin);
 
-  ply_event_loop_watch_signal (plugin->loop,
-                               SIGINT,
-                               (ply_event_handler_t) 
-                               on_interrupt, plugin);
-
   ply_trace ("starting boot animation");
   start_animation (plugin);
 
index 3b2a151b71ef191a9a612e542b56ea61b93d6993..53d9814ec90948f7add14d214952077a250805bb 100644 (file)
@@ -784,13 +784,6 @@ stop_animation (ply_boot_splash_plugin_t *plugin,
     ply_trigger_pull (trigger, NULL);
 }
 
-static void
-on_interrupt (ply_boot_splash_plugin_t *plugin)
-{
-  ply_event_loop_exit (plugin->loop, 1);
-  stop_animation (plugin, NULL);
-}
-
 static void
 detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
 {
@@ -1016,11 +1009,6 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
                                  detach_from_event_loop,
                                  plugin);
 
-  ply_event_loop_watch_signal (plugin->loop,
-                               SIGINT,
-                               (ply_event_handler_t)
-                               on_interrupt, plugin);
-
   ply_trace ("starting boot animations");
   start_progress_animation (plugin);