gui/ocarina: Deinitialize gui with the GtkApplication "shutdown" signal
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
d0179a9bfa
commit
fff2da5439
|
@ -76,26 +76,22 @@ static void __ocarina_startup(GApplication *application, gpointer data)
|
||||||
static void __ocarina_shutdown(GApplication *application, gpointer data)
|
static void __ocarina_shutdown(GApplication *application, gpointer data)
|
||||||
{
|
{
|
||||||
idle_cancel();
|
idle_cancel();
|
||||||
|
core_deinit();
|
||||||
|
|
||||||
|
gui_window_deinit();
|
||||||
|
gui_settings_deinit();
|
||||||
|
gui_builder_deinit();
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
GtkApplication *ocarina;
|
GtkApplication *ocarina = gtk_application_new(OCARINA_NAME, OCARINA_FLAGS);
|
||||||
int ret;
|
|
||||||
|
|
||||||
startup_argc = argc;
|
startup_argc = argc;
|
||||||
startup_argv = argv;
|
startup_argv = argv;
|
||||||
ocarina = gtk_application_new(OCARINA_NAME, OCARINA_FLAGS);
|
|
||||||
|
|
||||||
g_signal_connect(G_APPLICATION(ocarina), "activate", (GCallback)__ocarina_activate, NULL);
|
g_signal_connect(G_APPLICATION(ocarina), "activate", (GCallback)__ocarina_activate, NULL);
|
||||||
g_signal_connect(G_APPLICATION(ocarina), "startup", (GCallback)__ocarina_startup, NULL);
|
g_signal_connect(G_APPLICATION(ocarina), "startup", (GCallback)__ocarina_startup, NULL);
|
||||||
g_signal_connect(G_APPLICATION(ocarina), "shutdown", (GCallback)__ocarina_shutdown, NULL);
|
g_signal_connect(G_APPLICATION(ocarina), "shutdown", (GCallback)__ocarina_shutdown, NULL);
|
||||||
ret = g_application_run(G_APPLICATION(ocarina), argc, argv);
|
return g_application_run(G_APPLICATION(ocarina), argc, argv);
|
||||||
|
|
||||||
core_deinit();
|
|
||||||
gui_window_deinit();
|
|
||||||
gui_settings_deinit();
|
|
||||||
gui_builder_deinit();
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue