mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2753_broken_hotlist'

Browse Source 
* 2753_broken_hotlist:
  hotlist: fixed broken newly added entries.
  Ticket #2753: fixed entering to old-style path format.
This commit is contained in:
Slava Zanko 2012-03-22 11:17:13 +03:00
commit d94d43176a
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/filemanager/cmd.c
View File

@ -1259,7 +1259,15 @@ hotlist_cmd (void)
tree_chdir (the_tree, target); tree_chdir (the_tree, target);
else else
{ {
char *cmd = g_strconcat ("cd ", target, (char *) NULL); vfs_path_t *deprecated_vpath;
char *cmd, *normalized_target;
deprecated_vpath = vfs_path_from_str_flags (target, VPF_USE_DEPRECATED_PARSER);
normalized_target = vfs_path_to_str (deprecated_vpath);
cmd = g_strconcat ("cd ", normalized_target, (char *) NULL);
g_free (normalized_target);
vfs_path_free (deprecated_vpath);
do_cd_command (cmd); do_cd_command (cmd);
g_free (cmd); g_free (cmd);
} }
@ -1622,7 +1630,8 @@ single_dirsize_cmd (void)
ui = compute_dir_size_create_ui (); ui = compute_dir_size_create_ui ();
p = vfs_path_from_str_flags (entry->fname, VPF_NO_CANON); p = vfs_path_from_str_flags (entry->fname, VPF_NO_CANON);
if (compute_dir_size (p, ui, compute_dir_size_update_ui, &marked, &total, TRUE) == FILE_CONT) if (compute_dir_size (p, ui, compute_dir_size_update_ui, &marked, &total, TRUE) ==
FILE_CONT)
{ {
entry->st.st_size = (off_t) total; entry->st.st_size = (off_t) total;
entry->f.dir_size_computed = 1; entry->f.dir_size_computed = 1;

1
src/filemanager/hotlist.c
View File

@ -1712,7 +1712,6 @@ add2hotlist_cmd (void)
} }
add2hotlist (label, label_string, HL_TYPE_ENTRY, LISTBOX_APPEND_AT_END); add2hotlist (label, label_string, HL_TYPE_ENTRY, LISTBOX_APPEND_AT_END);
hotlist_state.modified = 1; hotlist_state.modified = 1;
g_free (label_string);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */