[gnome-terminal] Re-enable foreground process detection

[Christian Persch <chpe src gnome org>]

commit a21a7cc0d2ff65696ee15406d1fc05b79486375e
Author: Christian Persch <chpe gnome org>
Date:   Thu Aug 13 14:39:24 2009 +0200

    Re-enable foreground process detection
    
    Should fix bug #590952.
    
    This reverts commit 5b34cfbe5d447b7a011a0092b90568c3c21df1c9.

 src/terminal-screen.c |    4 ----
 src/terminal-window.c |   12 +++---------
 2 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index f0f964e..0ea8575 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -2314,9 +2314,6 @@ terminal_screen_save_config (TerminalScreen *screen,
 gboolean
 terminal_screen_has_foreground_process (TerminalScreen *screen)
 {
-  return FALSE;
-
-#if 0
   TerminalScreenPrivate *priv = screen->priv;
   int fgpid;
 
@@ -2328,7 +2325,6 @@ terminal_screen_has_foreground_process (TerminalScreen *screen)
     return FALSE;
 
   return TRUE;
-#endif
 
 #if 0
   char *cmdline, *basename, *name;
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 691530d..3098d14 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -3000,22 +3000,17 @@ confirm_close_window_or_tab (TerminalWindow *window,
 
   if (screen)
     {
-#if 0
       do_confirm = terminal_screen_has_foreground_process (screen);
-#endif
-      do_confirm = FALSE;
       n_tabs = 1;
     }
   else
     {
-      GList *tabs;
-      GList *t;
+      GList *tabs, *t;
+
+      do_confirm = FALSE;
 
       tabs = terminal_window_list_screen_containers (window);
       n_tabs = g_list_length (tabs);
-      do_confirm = n_tabs > 1;
-#if 0
-      do_confirm = FALSE;
 
       for (t = tabs; t != NULL; t = t->next)
         {
@@ -3028,7 +3023,6 @@ confirm_close_window_or_tab (TerminalWindow *window,
               break;
             }
         }
-#endif
       g_list_free (tabs);
     }