--- iagno.old/gnothello.c	Wed Jun  5 16:44:15 2002
+++ iagno/gnothello.c	Tue Jul  9 13:23:47 2002
@@ -241,7 +241,7 @@
 	}
 }
 
-void quit_game_cb(GtkWidget *widget, gpointer data)
+gboolean quit_game_cb(GtkWidget *widget, gpointer data)
 {
 	GtkWidget *dialog;
 
@@ -251,8 +251,8 @@
 		dialog = gtk_dialog_new_with_buttons (NULL,
 				GTK_WINDOW (window),
 				GTK_DIALOG_MODAL,
-				GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+                GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+				GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT,
 				NULL);
 		{
 			GtkWidget *label = gtk_label_new (_("Do you really want to quit?"));
@@ -268,9 +268,15 @@
 		gtk_widget_destroy (dialog);
 
 		if (response == GTK_RESPONSE_ACCEPT)
+        {
 			quit_game_maybe(NULL, 0);
+            return FALSE;
+        } else {
+            return TRUE;
+        }
 	} else {
 		quit_game_maybe(NULL, 0);
+        return FALSE;
 	}
 }
 
@@ -713,7 +719,7 @@
 
 	gtk_widget_realize(window);
 	gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
-	g_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(quit_game_cb), NULL);
+	g_signal_connect(GTK_OBJECT(window), "delete_event", G_CALLBACK(quit_game_cb), NULL);
 
 	gnome_app_create_menus(GNOME_APP(window), mainmenu);
 
@@ -912,7 +918,7 @@
 	gtk_object_sink(GTK_OBJECT(client));
 
 	g_signal_connect(GTK_OBJECT(client), "save_yourself", GTK_SIGNAL_FUNC(save_state), argv[0]);
-	g_signal_connect(GTK_OBJECT(client), "die", GTK_SIGNAL_FUNC(quit_game_cb), argv[0]);
+	g_signal_connect(GTK_OBJECT(client), "die", G_CALLBACK(quit_game_cb), argv[0]);
 
 	create_window();
 	
