fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 13:08:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove event handlers on destroy in plugins

Browse source 
This is because we can end up in scenarios
where a plugin gets destroyed, and readded
without getting hidden in between.
This commit is contained in:
Ray Strode 2009-03-09 12:18:56 -04:00
parent 2b0d185546
commit 546fbdc0b8
7 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/plugins/splash/details/plugin.c
View file

@ -64,6 +64,14 @@ typedef enum {
typedef void (* ply_boot_splash_plugin_window_handler_t) (ply_window_t *window, ply_boot_splash_plugin_t *, void *user_data, void *other_user_data);
static void uninitialize_window (ply_window_t *window,
ply_boot_splash_plugin_t *plugin);
static void for_each_window (ply_boot_splash_plugin_t *plugin,
ply_boot_splash_plugin_window_handler_t handler,
void *user_data,
void *other_user_data);
ply_boot_splash_plugin_interface_t *ply_boot_splash_plugin_get_interface (void);
struct _ply_boot_splash_plugin
{
@ -94,6 +102,10 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin == NULL)
return;
for_each_window (plugin,
(ply_boot_splash_plugin_window_handler_t)
uninitialize_window, NULL, NULL);
ply_list_free (plugin->windows);
free (plugin);

2
src/plugins/splash/fade-in/plugin.c
View file

@ -167,6 +167,8 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin == NULL)
return;
remove_handlers (plugin);
if (plugin->loop != NULL)
{
ply_event_loop_stop_watching_for_exit (plugin->loop, (ply_event_loop_exit_handler_t)

2
src/plugins/splash/glow/plugin.c
View file

@ -125,6 +125,8 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin == NULL)
return;
remove_handlers (plugin);
if (plugin->loop != NULL)
{
ply_event_loop_stop_watching_for_exit (plugin->loop, (ply_event_loop_exit_handler_t)

2
src/plugins/splash/pulser/plugin.c
View file

@ -102,6 +102,8 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin == NULL)
return;
remove_handlers (plugin);
/* It doesn't ever make sense to keep this plugin on screen
* after exit
*/

1
src/plugins/splash/solar/plugin.c
View file

@ -245,6 +245,7 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin == NULL)
return;
remove_handlers (plugin);
if (plugin->loop != NULL)
{

2
src/plugins/splash/spinfinity/plugin.c
View file

@ -126,6 +126,8 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin == NULL)
return;
remove_handlers (plugin);
if (plugin->loop != NULL)
{
ply_event_loop_stop_watching_for_exit (plugin->loop, (ply_event_loop_exit_handler_t)

2
src/plugins/splash/text/plugin.c
View file

@ -107,6 +107,8 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
if (plugin == NULL)
return;
remove_handlers (plugin);
/* It doesn't ever make sense to keep this plugin on screen
* after exit
*/