mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1999-03-12 Federico Mena Quintero <federico@nuclecu.unam.mx> 

* file.c (erase_file): Here we need to mc_lstat(), not mc_stat().
	Since we use the resulting buf.st_size to update the progress, we
	need the size of unresolved links.  This also makes it consistent
	with screen.c:do_file_mark().

	* screen.c (select_item): Return immediately if this is a desktop
	panel.

1999-03-12  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gdesktop.c (create_panel_from_desktop): Do not assert that
	panel->count > 0, because we may actually not have any icons in
	the desktop.
	(desktop_popup): Reload the desktop once the popup menu is done.
	(create_panel_from_desktop): Be consistent with the way totals are
	computed in screen.c:do_file_mark().
This commit is contained in:
Miguel de Icaza 1999-03-13 01:02:29 +00:00
parent 903f57ef76
commit 824fdcc5b8
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnome/ChangeLog
View File

@ -4,6 +4,8 @@
panel->count > 0, because we may actually not have any icons in
the desktop.
(desktop_popup): Reload the desktop once the popup menu is done.
(create_panel_from_desktop): Be consistent with the way totals are
computed in screen.c:do_file_mark().
* gnome-file-property-dialog.c (gnome_file_property_dialog_init):
Set the dialog to not destroy-on-close.

8
gnome/gdesktop.c
View File

@ -1341,10 +1341,12 @@ create_panel_from_desktop (void)
marked_count++;
fe->f.marked = TRUE;
if (S_ISDIR (fe->buf.st_mode))
if (S_ISDIR (fe->buf.st_mode)) {
dir_marked_count++;
total += fe->buf.st_size;
if (fe->f.dir_size_computed)
total += fe->buf.st_size;
} else
total += fe->buf.st_size;
}
g_free (full_name);

10
src/ChangeLog
View File

@ -1,3 +1,13 @@
1999-03-12 Federico Mena Quintero <federico@nuclecu.unam.mx>
* file.c (erase_file): Here we need to mc_lstat(), not mc_stat().
Since we use the resulting buf.st_size to update the progress, we
need the size of unresolved links. This also makes it consistent
with screen.c:do_file_mark().
* screen.c (select_item): Return immediately if this is a desktop
panel.
1999-03-12 Miguel de Icaza <miguel@nuclecu.unam.mx>
* subshell.c (pty_open_slave): Glibc-2.1-based Linux kernels have

2
src/file.c
View File

@ -1330,7 +1330,7 @@ erase_file (FileOpContext *ctx, char *s, long *progress_count, double *progress_
return FILE_ABORT;
mc_refresh ();
if (progress_count && mc_stat (s, &buf)) {
if (progress_count && mc_lstat (s, &buf)) {
/* ignore, most likely the mc_unlink fails, too */
buf.st_size = 0;
}

3
src/screen.c
View File

@ -1495,6 +1495,9 @@ select_item (WPanel *panel)
old_top = panel->top_file;
#endif
if (is_a_desktop_panel (panel))
return;
if (panel->top_file < 0){
repaint = 1;
panel->top_file = 0;