isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 13:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/kms/hotplug: Clean up signal handlers in switch-config test

Browse Source 
They remained connected, and poked at subsequent tests stack, causing
unexplainable crashes.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3233>
This commit is contained in:
Jonas Ådahl 2023-09-02 11:22:14 +02:00 committed by Marge Bot
parent 96d4ae5ac8
commit efbb8df611
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tests/native-kms-hotplug.c
View File

@ -248,6 +248,7 @@ meta_test_switch_config (void)
MtkRectangle logical_monitor_layout; MtkRectangle logical_monitor_layout;
gulong after_paint_handler_id; gulong after_paint_handler_id;
gulong presented_handler_id; gulong presented_handler_id;
gulong monitors_changed_handler_id;
gboolean monitors_changed; gboolean monitors_changed;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
ClutterActor *actor; ClutterActor *actor;
@ -259,9 +260,10 @@ meta_test_switch_config (void)
presented_handler_id = g_signal_connect (stage, "presented", presented_handler_id = g_signal_connect (stage, "presented",
G_CALLBACK (on_presented), G_CALLBACK (on_presented),
&state); &state);
g_signal_connect (monitor_manager, "monitors-changed", monitors_changed_handler_id =
G_CALLBACK (on_monitors_changed), g_signal_connect (monitor_manager, "monitors-changed",
&monitors_changed); G_CALLBACK (on_monitors_changed),
&monitors_changed);
logical_monitors = logical_monitors =
meta_monitor_manager_get_logical_monitors (monitor_manager); meta_monitor_manager_get_logical_monitors (monitor_manager);
@ -291,9 +293,6 @@ meta_test_switch_config (void)
monitor_manager); monitor_manager);
monitors_changed = FALSE; monitors_changed = FALSE;
g_signal_connect (monitor_manager, "monitors-changed",
G_CALLBACK (on_monitors_changed),
&monitors_changed);
g_debug ("Sending virtual keyboard event"); g_debug ("Sending virtual keyboard event");
virtual_keyboard = virtual_keyboard =
@ -322,6 +321,7 @@ meta_test_switch_config (void)
g_signal_handler_disconnect (stage, after_paint_handler_id); g_signal_handler_disconnect (stage, after_paint_handler_id);
g_signal_handler_disconnect (stage, presented_handler_id); g_signal_handler_disconnect (stage, presented_handler_id);
g_signal_handler_disconnect (monitor_manager, monitors_changed_handler_id);
} }
static void static void