diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index 90c583a..d50347d 100644
--- a/src/canberra-gtk-module.c
+++ b/src/canberra-gtk-module.c
@@ -932,7 +932,7 @@ static void connect_settings(void) {
         connected = TRUE;
 }
 
-static gboolean quit_handler(gpointer data) {
+static gboolean quit_handler(void) {
         dispatch_queue();
         return FALSE;
 }
@@ -964,7 +964,7 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
         install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
         install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
 
-        gtk_quit_add(1, quit_handler, NULL);
+        g_atexit(quit_handler);
 }
 
 G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);