Various error-handling fixes, mostly in Unix PuTTY but one (failure

[u/mdw/putty] / unix / gtkdlg.c

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 6f906df..a454d8b 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -2337,30 +2337,21 @@ void old_keyfile_warning(void)
      */
 }
 
-void fatalbox(char *p, ...)
+void fatal_message_box(void *window, char *msg)
 {
-    va_list ap;
-    char *msg;
-    va_start(ap, p);
-    msg = dupvprintf(p, ap);
-    va_end(ap);
-    messagebox(NULL, "PuTTY Fatal Error", msg,
+    messagebox(window, "PuTTY Fatal Error", msg,
                string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
                "OK", 'o', 1, 1, NULL);
-    sfree(msg);
-    cleanup_exit(1);
 }
-void connection_fatal(void *frontend, char *p, ...)
+
+void fatalbox(char *p, ...)
 {
     va_list ap;
     char *msg;
     va_start(ap, p);
     msg = dupvprintf(p, ap);
     va_end(ap);
-    messagebox(GTK_WIDGET(get_window(frontend)),
-               "PuTTY Fatal Error", msg,
-               string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
-               "OK", 'o', 1, 1, NULL);
+    fatal_message_box(NULL, msg);
     sfree(msg);
     cleanup_exit(1);
 }