Merge branch '4541_hide_vfs_password'

* 4541_hide_vfs_password: (truncFileString): isn't used anymore. Remove. Ticket #4541: (file_progress_show_source): hide VFS password.
MidnightCommander · May 26, 2024 · cb97cd2 · cb97cd2
2 parents 57cf824 + dffcec5
commit cb97cd2
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c
@@ -167,7 +167,6 @@ gboolean classic_progressbar = TRUE;
 
 /*** file scope macro definitions ****************************************************************/
 
-#define truncFileString(dlg, s)       str_trunc (s, WIDGET (dlg)->rect.cols - 10)
 #define truncFileStringSecure(dlg, s) path_trunc (s, WIDGET (dlg)->rect.cols - 10)
 
 /*** file scope type declarations ****************************************************************/
@@ -1142,12 +1141,8 @@ file_progress_show_source (file_op_context_t * ctx, const vfs_path_t * vpath)
 
     if (vpath != NULL)
     {
-        char *s;
-
-        s = vfs_path_tokens_get (vpath, -1, 1);
         label_set_text (ui->src_file_label, _("Source"));
-        label_set_text (ui->src_file, truncFileString (ui->op_dlg, s));
-        g_free (s);
+        label_set_text (ui->src_file, truncFileStringSecure (ui->op_dlg, vfs_path_as_str (vpath)));
     }
     else
     {