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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0b9770c434f7bd813f98dadcf609d6772760e153..852f0f27550d2b64052c9ed9b189d34e13c70205 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-09  Andrew Burgess  <aburgess@broadcom.com>
+
+       * top.c (quit_confirm): Remove use of deprecated_init_ui_hook.
+
 2013-09-06  Pedro Alves <palves@redhat.com>
 
        * remote-sim.c (dump_mem, gdbsim_fetch_register)

diff --git a/gdb/top.c b/gdb/top.c
index b3e7d37536056b3c9fbcfb2c8d39c074244f3b8b..d9128a3e86b26ea3d3072bad323a78ee4ecc3e0e 100644 (file)
--- 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);