* cmd.c (free_vfs_now) [HAVE_GNOME]: Eliminate.

(reselect_vfs) [HAVE_GNOME]: Likewise.
* main.c (ctl_x_map) [HAVE_GNOME]: Disable add2hotlist_cmd.
(done_mc) [HAVE_X]: Don't call save_hotlist().
* setup.c (save_setup) [HAVE_X]: Likewise.
(done_setup) [HAVE_X]: Don't call done_hotlist().

src/ChangeLog

@@ -1,3 +1,12 @@
+2001-06-02  Pavel Roskin  <proski@gnu.org>
+
+	* cmd.c (free_vfs_now) [HAVE_GNOME]: Eliminate.
+	(reselect_vfs) [HAVE_GNOME]: Likewise.
+	* main.c (ctl_x_map) [HAVE_GNOME]: Disable add2hotlist_cmd.
+	(done_mc) [HAVE_X]: Don't call save_hotlist().
+	* setup.c (save_setup) [HAVE_X]: Likewise.
+	(done_setup) [HAVE_X]: Don't call done_hotlist().
+
 2001-06-01  Pavel Roskin  <proski@gnu.org>
 
 	* hotlist.c [HAVE_X]: Don't use ctrl_pressed().

src/cmd.c

@@ -714,7 +714,6 @@ void quick_chdir_cmd (void)
 	    message (1, MSG_ERROR, _("Could not change directory") );
     g_free (target);
 }
-#endif /* !HAVE_GNOME */
 
 #ifdef USE_VFS
 void free_vfs_now (void)
@@ -735,6 +734,7 @@ void reselect_vfs (void)
     g_free (target);
 }
 #endif /* USE_VFS */
+#endif /* !HAVE_GNOME */
 
 static int compare_files (char *name1, char *name2, long size)
 {

src/main.c

@@ -1735,33 +1735,33 @@ init_labels (Widget *paneletc)
 
 static const key_map ctl_x_map [] = {
     { XCTRL('c'),   (callfn) quit_cmd },
-#ifdef USE_VFS
-    { 'a',          reselect_vfs },
-#endif
     { 'd',          compare_dirs_cmd },
 #ifndef HAVE_GNOME
+#ifdef USE_VFS
+    { 'a',          reselect_vfs },
+#endif /* USE_VFS */
     { 'p',          copy_current_pathname },
     { XCTRL('p'),   copy_other_pathname },
     { 't',          copy_current_tagged },
     { XCTRL('t'),   copy_other_tagged },
     { 'c',          chmod_cmd },
-#endif
+#endif /* !HAVE_GNOME */
 #ifndef OS2_NT
 #ifndef HAVE_GNOME
     { 'o',          chown_cmd },
-#endif
+#endif /* !HAVE_GNOME */
     { 'l',          link_cmd },
     { XCTRL('l'),   other_symlink_cmd },
     { 's',          symlink_cmd },
     { XCTRL('s'),   edit_symlink_cmd },
     { 'r',          copy_current_readlink },
     { XCTRL('r'),   copy_other_readlink },
-#endif
+#endif /* !OS2_NT */
 #ifndef HAVE_GNOME
     { 'i',          info_cmd_no_menu },
     { 'q',          quick_cmd_no_menu },
-#endif
     { 'h',          add2hotlist_cmd },
+#endif /* !HAVE_GNOME */
     { '!',          external_panelize },
 #if defined(WITH_BACKGROUND) && !defined(HAVE_GNOME)
     { 'j',          jobs_cmd },
@@ -1930,8 +1930,10 @@ static void done_mc ()
      */
     if (auto_save_setup)
 	save_setup ();   /* does also call save_hotlist */
+#ifndef HAVE_X
     else
 	save_hotlist();
+#endif /* !HAVE_X */
     done_screen ();
     vfs_add_current_stamps ();
     if (xterm_flag && xterm_hintbar)

src/setup.c

@@ -425,7 +425,9 @@ save_setup (void)
     if (get_current_panel () != NULL)
 	    WritePrivateProfileString ("Dirs", "current_is_left",
 				       get_current_index () == 0 ? "1" : "0", profile);
+#ifndef HAVE_X
     save_hotlist ();
+#endif /* !HAVE_X */
     save_panelize ();
     save_panel_types ();
 /*     directory_history_save (); */
@@ -659,7 +661,9 @@ load_anon_passwd ()
 void done_setup (void)
 {
     g_free (profile_name);
+#ifndef HAVE_X
     done_hotlist ();
+#endif /* HAVE_X */
     done_panelize ();
 /*    directory_history_free (); */
 }