diff -rcB gnome-terminal-2.24.3/src/terminal-window.c gnome-terminal-2.24.3-popup/src/terminal-window.c
*** gnome-terminal-2.24.3/src/terminal-window.c	2009-01-12 08:54:15.000000000 -0600
--- gnome-terminal-2.24.3-popup/src/terminal-window.c	2009-08-17 21:50:51.190364354 -0500
***************
*** 1124,1134 ****
    action = gtk_action_group_get_action (priv->action_group, "PopupCopyLinkAddress");
    gtk_action_set_visible (action, show_link);
  
-   action = gtk_action_group_get_action (priv->action_group, "PopupCloseWindow");
-   gtk_action_set_visible (action, priv->terms <= 1);
-   action = gtk_action_group_get_action (priv->action_group, "PopupCloseTab");
-   gtk_action_set_visible (action, priv->terms > 1);
- 
    action = gtk_action_group_get_action (priv->action_group, "PopupCopy");
    gtk_action_set_sensitive (action, vte_terminal_get_has_selection (VTE_TERMINAL (screen)));
    action = gtk_action_group_get_action (priv->action_group, "PopupPaste");
--- 1124,1129 ----
***************
*** 1478,1489 ****
        { "PopupNewTab", NULL, N_("Open Ta_b"), NULL,
          NULL,
          G_CALLBACK (file_new_tab_callback) },
-       { "PopupCloseWindow", NULL, N_("C_lose Window"), NULL,
-         NULL,
-         G_CALLBACK (file_close_window_callback) },
-       { "PopupCloseTab", NULL, N_("C_lose Tab"), NULL,
-         NULL,
-         G_CALLBACK (file_close_tab_callback) },
        { "PopupInputMethods", NULL, N_("_Input Methods") }
      };
    
--- 1473,1478 ----
diff -rcB gnome-terminal-2.24.3/src/terminal.xml gnome-terminal-2.24.3-popup/src/terminal.xml
*** gnome-terminal-2.24.3/src/terminal.xml	2009-01-12 08:54:15.000000000 -0600
--- gnome-terminal-2.24.3-popup/src/terminal.xml	2009-08-17 21:21:33.981366563 -0500
***************
*** 66,74 ****
      <menuitem action="PopupNewTerminal" />
      <menuitem action="PopupNewTab" />
      <separator />
-     <menuitem action="PopupCloseTab" />
-     <menuitem action="PopupCloseWindow" />
-     <separator />
      <menuitem action="PopupCopy" />
      <menuitem action="PopupPaste" />
      <menuitem action="PopupPasteURIPaths" />
--- 66,71 ----
