* boxes.c (tree): Rename to tree_box() to avoid confusion.

Adjust all callers and headers.
* main.c (tree_box): Rename to tree_box_cmd().

src/ChangeLog

@@ -1,5 +1,9 @@
 2001-10-01  Pavel Roskin  <proski@gnu.org>
 
+	* boxes.c (tree): Rename to tree_box() to avoid confusion.
+	Adjust all callers and headers.
+	* main.c (tree_box): Rename to tree_box_cmd().
+
 	* tree.c (set_navig_label): Get argument "tree".
 	(set_navig_label): Likewise.  Adjust all callers.  Don't cast
 	function tree() to (Widget *) - it's wrong and dangerous.

src/boxes.c

@@ -681,8 +681,9 @@ tree_callback (struct Dlg_head *h, int id, int msg)
     return MSG_NOT_HANDLED;
 }
 
+/* Show tree in a box, not on a panel */
 char *
-tree (char *current_dir)
+tree_box (char *current_dir)
 {
     WTree    *mytree;
     Dlg_head *dlg;

src/boxes.h

@@ -14,5 +14,6 @@ void    jobs_cmd         (void);
 char   *cd_dialog        (void);
 void    symlink_dialog   (char *existing, char *new,
 			  char **ret_existing, char **ret_new);
+char   *tree_box         (char *current_dir);
 
 #endif

src/find.c

@@ -42,8 +42,8 @@
 #include "panel.h"		/* current_panel */
 #include "main.h"		/* do_cd, try_to_select */
 #include "wtools.h"
-#include "tree.h"
 #include "cmd.h"		/* view_file_at_line */
+#include "boxes.h"
 #include "../vfs/vfs.h"
 
 #if defined(HAVE_RX_H) && defined(HAVE_REGCOMP)
@@ -243,7 +243,7 @@ find_par_start:
 	   g_free (temp_dir);
 	    temp_dir = g_strdup (cpanel->cwd);
 	}
-	in_start_dir = tree (temp_dir);
+	in_start_dir = tree_box (temp_dir);
 	if (in_start_dir)
 	   g_free (temp_dir);
 	else

src/main.c

@@ -1097,11 +1097,11 @@ sort_cmd (void)
 }
 
 static void
-tree_box (void)
+treebox_cmd (void)
 {
     char *sel_dir;
 
-    sel_dir = tree (selection (cpanel)->fname);
+    sel_dir = tree_box (selection (cpanel)->fname);
     if (sel_dir){
 	do_cd(sel_dir, cd_exact);
 	g_free (sel_dir);
@@ -1200,7 +1200,7 @@ static menu_entry CmdMenu [] = {
      * as a panel still has some problems, I have not yet finished
      * the WTree widget port, sorry.
      */
-    { ' ', N_("&Directory tree"),               'D', tree_box },
+    { ' ', N_("&Directory tree"),               'D', treebox_cmd },
     { ' ', 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 },

src/tree.h

@@ -21,7 +21,6 @@ typedef struct {
 
 int tree_init (char *current_dir, int lines);
 void tree_chdir (WTree *tree, char *dir);
-char *tree (char *current_dir);
 
 void sync_tree (char *pathname);