From 17724b40046f863bbf65505a6b0de59ea3338cdb Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 30 May 2001 00:16:19 +0000 Subject: [PATCH] * cmd.c (quick_cd_cmd) [HAVE_GNOME]: Disable. * main.c (sort_cmd) [HAVE_GNOME]: Likewise. (ctl_x_map) [HAVE_GNOME]: Disable "Ctrl-x j" - background jobs. --- src/ChangeLog | 4 ++++ src/cmd.c | 4 +++- src/main.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4023d6950..9acf947a7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2001-05-29 Pavel Roskin + * cmd.c (quick_cd_cmd) [HAVE_GNOME]: Disable. + * main.c (sort_cmd) [HAVE_GNOME]: Likewise. + (ctl_x_map) [HAVE_GNOME]: Disable "Ctrl-x j" - background jobs. + * color.c (init_colors) [HAVE_SLANG]: Use "default" instead of NULL as color names - this works even if COLORFGBG is unset. Don't check HAS_DIRECT_COLOR_ACCESS - it's now meaningless. diff --git a/src/cmd.c b/src/cmd.c index 666d72fea..e2b171cbd 100644 --- a/src/cmd.c +++ b/src/cmd.c @@ -1424,8 +1424,9 @@ void undelete_cmd (void) " files on: (F1 for details)"), "[Undelete File System]", "/#undel:", 0); } -#endif +#endif /* USE_EXT2FSLIB */ +#ifndef HAVE_GNOME void quick_cd_cmd (void) { char *p = cd_dialog (); @@ -1439,6 +1440,7 @@ void quick_cd_cmd (void) if (p) g_free (p); } +#endif /* !HAVE_GNOME */ void dirsizes_cmd (void) diff --git a/src/main.c b/src/main.c index ea23c1c85..f9cfaaf02 100644 --- a/src/main.c +++ b/src/main.c @@ -1193,6 +1193,7 @@ set_sort_to (WPanel *p, sortfn *sort_order) do_re_sort (p); } #endif +#ifndef HAVE_GNOME void sort_cmd (void) { @@ -1209,7 +1210,6 @@ sort_cmd (void) } -#ifndef HAVE_GNOME static void tree_box (void) { @@ -1763,7 +1763,7 @@ static const key_map ctl_x_map [] = { #endif { 'h', add2hotlist_cmd }, { '!', external_panelize }, -#ifdef WITH_BACKGROUND +#if defined(WITH_BACKGROUND) && !defined(HAVE_GNOME) { 'j', jobs_cmd }, #endif #ifdef HAVE_SETSOCKOPT