wire up destroy

2 files changed, 8 insertions, 4 deletions

diff --git a/main.ui b/main.ui
index 4159d66..06a0de7 100644
--- a/main.ui
+++ b/main.ui
@@ -7,6 +7,7 @@
     <property name="title" translatable="yes">vconsole</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
+    <signal name="destroy" handler="window-destroy" swapped="no"/>
     <child type="titlebar">
       <placeholder/>
     </child>
diff --git a/vconsole.c b/vconsole.c
index 4214bd9..b6be027 100644
--- a/vconsole.c
+++ b/vconsole.c
@@ -778,7 +778,7 @@ static gboolean window_state_cb(GtkWidget *widget, GdkEventWindowState *event,
 
 #endif
 
-static void destroy(GtkWidget *widget, gpointer data)
+static void window_destroy(GtkWidget *widget, gpointer data)
 {
     gtk_main_quit();
 }
@@ -896,11 +896,14 @@ static struct vconsole_window *vconsole_toplevel_create(void)
     win = g_new0(struct vconsole_window, 1);
 
     builder = gtk_builder_new_from_string(main_ui, -1);
-    gtk_builder_connect_signals(builder, NULL);
     win->toplevel = GTK_WIDGET(gtk_builder_get_object(builder, "toplevel"));
     win->notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook"));
-    fprintf(stderr, "%s: %p %p\n", __func__,
-            win->toplevel, win->notebook);
+
+    gtk_builder_add_callback_symbols
+        (builder,
+         "window-destroy", G_CALLBACK(window_destroy),
+         NULL);
+    gtk_builder_connect_signals(builder, win);
 
     g_object_unref(builder);
 #endif