From cc8fa6552a1dd43fdf5131cdcb3b5fa329765c2c Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Tue, 15 May 2001 00:53:48 +0000
Subject: [PATCH] * main.c [HAVE_GNOME]: Disable more code. * cmd.c
 [HAVE_GNOME]: Likewise.

---
 src/ChangeLog |  3 +++
 src/cmd.c     | 10 ++++------
 src/main.c    |  6 ------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 34a2d712a..8a1ee1f5a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-05-14  Pavel Roskin  <proski@gnu.org>
 
+	* main.c [HAVE_GNOME]: Disable more code.
+	* cmd.c [HAVE_GNOME]: Likewise.
+
 	* background.h: Omit definitions that require FileOpContext if
 	fileopctx.h has not been included yet.
 
diff --git a/src/cmd.c b/src/cmd.c
index bb29bcc3d..9131c94da 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -612,6 +612,7 @@ void unselect_cmd (void)
 	unselect_cmd_panel (cpanel);
 }
 
+#ifndef HAVE_GNOME
 /* Check if the file exists */
 /* If not copy the default */
 static int check_for_default(char *default_file, char *file)
@@ -633,7 +634,6 @@ static int check_for_default(char *default_file, char *file)
     return 0;
 }
 
-#ifndef HAVE_GNOME
 void ext_cmd (void)
 {
     char *buffer;
@@ -659,7 +659,6 @@ void ext_cmd (void)
    g_free (extdir);
    flush_extension_file ();
 }
-#endif /* !HAVE_GNOME */
 
 /* where  = 0 - do edit a file menu for mc */
 /* where  = 1 - do edit a file menu for cool edit */
@@ -712,15 +711,14 @@ void quick_chdir_cmd (void)
     if (!target)
 	return;
 
-#ifndef HAVE_GNOME
     if (get_current_type () == view_tree)
 	tree_chdir (the_tree, target);
     else
-#endif
         if (!do_cd (target, cd_exact))
 	    message (1, MSG_ERROR, _("Could not change directory") );
     g_free (target);
 }
+#endif /* !HAVE_GNOME */
 
 #ifdef USE_VFS
 void free_vfs_now (void)
@@ -878,6 +876,7 @@ void compare_dirs_cmd (void)
     }
 }
 
+#ifndef HAVE_GNOME
 void history_cmd (void)
 {
     Listbox *listbox;
@@ -916,14 +915,12 @@ void history_cmd (void)
     update_input (input_w (cmdline), 1);
 }
 
-#if !defined(HAVE_XVIEW) && !defined(HAVE_GNOME)
 void swap_cmd (void)
 {
     swap_panels ();
     touchwin (stdscr);
     repaint_screen ();
 }
-#endif
 
 void
 view_other_cmd (void)
@@ -1018,6 +1015,7 @@ view_other_cmd (void)
 	    repaint_screen ();
     }
 }
+#endif /* !HAVE_GNOME */
 
 #ifndef OS2_NT
 static void
diff --git a/src/main.c b/src/main.c
index 37a31d0bf..f5647e5e3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1293,7 +1293,6 @@ static menu_entry RightMenu [] = {
     { ' ', N_("&Rescan         C-r"),    'R', reread_cmd }
 };
 
-#ifndef HAVE_GNOME
 static menu_entry FileMenu [] = {
     { ' ', N_("&User menu          F2"), 'U', user_file_menu_cmd },
     { ' ', N_("&View               F3"), 'V', view_cmd },
@@ -1320,7 +1319,6 @@ static menu_entry FileMenu [] = {
     { ' ', "", ' ', 0 },
     { ' ', N_("e&Xit              F10"), 'X', (callfn) quit_cmd }
 };
-#endif
 
 void external_panelize (void);
 static menu_entry CmdMenu [] = {
@@ -1328,9 +1326,7 @@ static menu_entry CmdMenu [] = {
      * as a panel still has some problems, I have not yet finished
      * the WTree widget port, sorry.
      */
-#ifndef HAVE_GNOME
     { ' ', N_("&Directory tree"),               'D', tree_box },
-#endif
     { ' ', N_("&Find file            M-?"),     'F', find_cmd },
     { ' ', N_("s&Wap panels          C-u"),     'W', swap_cmd },
     { ' ', N_("switch &Panels on/off C-o"),     'P', view_other_cmd },
@@ -1423,9 +1419,7 @@ done_menu (void)
 #endif
     }
 }
-#endif
     
-#ifndef HAVE_GNOME
 static void
 menu_last_selected_cmd (void)
 {