From 5a5d8ead9470d24e05f64c39e28e74462794a1ba Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Mon, 9 Sep 2013 12:13:58 +0000 Subject: [PATCH] Remove use of deprecated_init_ui_hook from quit_confirm. https://sourceware.org/ml/gdb-patches/2013-09/msg00224.html gdb/ChangeLog * top.c (quit_confirm): Remove use of deprecated_init_ui_hook. --- gdb/ChangeLog | 4 ++++ gdb/top.c | 15 +++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0b9770c434f..852f0f27550 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2013-09-09 Andrew Burgess + + * top.c (quit_confirm): Remove use of deprecated_init_ui_hook. + 2013-09-06 Pedro Alves * remote-sim.c (dump_mem, gdbsim_fetch_register) diff --git a/gdb/top.c b/gdb/top.c index b3e7d375360..d9128a3e86b 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1355,18 +1355,9 @@ quit_confirm (void) stb = mem_fileopen (); old_chain = make_cleanup_ui_file_delete (stb); - /* This is something of a hack. But there's no reliable way to see - if a GUI is running. The `use_windows' variable doesn't cut - it. */ - if (deprecated_init_ui_hook) - fprintf_filtered (stb, _("A debugging session is active.\n" - "Do you still want to close the debugger?")); - else - { - fprintf_filtered (stb, _("A debugging session is active.\n\n")); - iterate_over_inferiors (print_inferior_quit_action, stb); - fprintf_filtered (stb, _("\nQuit anyway? ")); - } + fprintf_filtered (stb, _("A debugging session is active.\n\n")); + iterate_over_inferiors (print_inferior_quit_action, stb); + fprintf_filtered (stb, _("\nQuit anyway? ")); str = ui_file_xstrdup (stb, NULL); make_cleanup (xfree, str); -- 2.30.2