mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-09 13:02:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

patches by Rostislav Beneš: mc-28-fix

Browse Source 
rest of fixes in files cmc.c, main.c (xterm title), panelize.c, subshell.c,
tree.c, tty.c, user.c, util.c, win.c

now, basic mc's function should work well, editor and view are still broken.
This commit is contained in:
Slava Zanko 2008-12-29 01:53:08 +02:00
parent 86fb0bfc03
commit 1eaadfae0b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd.c
View File

@ -908,7 +908,7 @@ do_link (int symbolic_link, const char *fname)
char *dest = NULL, *src = NULL;
if (!symbolic_link) {
src = g_strdup_printf (_("Link %s to:"), name_trunc (fname, 46));
src = g_strdup_printf (_("Link %s to:"), str_trunc (fname, 46));
dest = input_expand_dialog (_(" Link "), src, MC_HISTORY_FM_LINK, "");
if (!dest || !*dest)
goto cleanup;

7
src/tree.c
View File

@ -601,7 +601,7 @@ static void tree_copy (WTree *tree, const char *default_dest)
if (!tree->selected_ptr)
return;
g_snprintf (cmd_buf, sizeof(cmd_buf), _("Copy \"%s\" directory to:"),
name_trunc (tree->selected_ptr->name, 50));
str_trunc (tree->selected_ptr->name, 50));
dest = input_expand_dialog (_(" Copy "), cmd_buf, MC_HISTORY_FM_TREE_COPY, default_dest);
if (!dest)
@ -644,8 +644,13 @@ static void tree_move (WTree *tree, const char *default_dest)
if (!tree->selected_ptr)
return;
g_snprintf (cmd_buf, sizeof (cmd_buf), _("Move \"%s\" directory to:"),
<<<<<<< HEAD:src/tree.c
name_trunc (tree->selected_ptr->name, 50));
dest = input_expand_dialog (_(" Move "), cmd_buf, MC_HISTORY_FM_TREE_MOVE, default_dest);
=======
str_trunc (tree->selected_ptr->name, 50));
dest = input_expand_dialog (_(" Move "), cmd_buf, default_dest);
>>>>>>> patches by Rostislav Beneš: mc-28-fix:src/tree.c
if (!dest)
return;
if (!*dest){