Consistent Quit behavior on the Mac

We were responding to the wrong Quit signal on MacOS. The one we picked
was the one that basically told us "it's too late to stop me, I'm
quitting". I switched this to the one asking "should I prevent the app
from quitting" and now we can indeed cancel the Quit, regardless which
method was used to close the app.

Also removes to unused variables.

Fixes #22

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1 insertions, 3 deletions

diff --git a/macos.c b/macos.c
index e989d96a5..f6557bf3d 100644
--- a/macos.c
+++ b/macos.c
@@ -79,8 +79,6 @@ int subsurface_fill_device_list(GtkListStore *store)
 	GtkTreeIter iter;
 	GDir *dev;
 	const char *name;
-	char *buffer;
-	gsize length;
 
 	dev = g_dir_open("/dev", 0, NULL);
 	while (dev && (name = g_dir_read_name(dev)) != NULL) {
@@ -206,7 +204,7 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
 
 	gtk_osxapplication_set_use_quartz_accelerators(osx_app, TRUE);
 	g_signal_connect(osx_app,"NSApplicationDidBecomeActive",G_CALLBACK(show_main_window),NULL);
-	g_signal_connect(osx_app,"NSApplicationWillTerminate",G_CALLBACK(quit),NULL);
+	g_signal_connect(osx_app, "NSApplicationBlockTermination", G_CALLBACK(on_delete), NULL);
 
 	gtk_osxapplication_ready(osx_app);
 }