Fix crashes reported by Jim.
Add support for DEL key killing files requested. Added missing calls to tree_store_end_check
Этот коммит содержится в:
родитель
aab8269cca
Коммит
913c2c689c
@ -183,7 +183,7 @@ void
|
|||||||
set_hintbar (char *str)
|
set_hintbar (char *str)
|
||||||
{
|
{
|
||||||
/*gtk_label_set (GTK_LABEL (current_panel_ptr->panel->status), str);*/
|
/*gtk_label_set (GTK_LABEL (current_panel_ptr->panel->status), str);*/
|
||||||
x_flush_events ();
|
/* x_flush_events (); */
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -47,7 +47,11 @@ ALLICONS = \
|
|||||||
|
|
||||||
all:
|
all:
|
||||||
|
|
||||||
install: @insticons@
|
install: @insticons@ Makefile
|
||||||
|
|
||||||
|
Makefile: Makefile.in ../config.status
|
||||||
|
(cd ..; CONFIG_FILES=new_icons/Makefile CONFIG_HEADERS= ./config.status)
|
||||||
|
|
||||||
|
|
||||||
install_icons:
|
install_icons:
|
||||||
for I in $(ALLICONS); \
|
for I in $(ALLICONS); \
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
1999-02-10 Miguel de Icaza <miguel@nuclecu.unam.mx>
|
||||||
|
|
||||||
|
* screen.c: Make delete key delete files.
|
||||||
|
|
||||||
|
* dir.c (do_reload_dir): Add a couple of missing calls to tree_store_end_check.
|
||||||
|
|
||||||
1999-02-10 Federico Mena Quintero <federico@nuclecu.unam.mx>
|
1999-02-10 Federico Mena Quintero <federico@nuclecu.unam.mx>
|
||||||
|
|
||||||
* main.h: Added prototype for main_corba_register_server().
|
* main.h: Added prototype for main_corba_register_server().
|
||||||
|
@ -560,6 +560,7 @@ int do_reload_dir (dir_list *list, sortfn *sort, int count, int rev,
|
|||||||
dirp = mc_opendir (".");
|
dirp = mc_opendir (".");
|
||||||
if (!dirp) {
|
if (!dirp) {
|
||||||
clean_dir (list, count);
|
clean_dir (list, count);
|
||||||
|
tree_store_end_check ();
|
||||||
return set_zero_dir (list);
|
return set_zero_dir (list);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -590,6 +591,7 @@ int do_reload_dir (dir_list *list, sortfn *sort, int count, int rev,
|
|||||||
IMHO it's not worthwhile).
|
IMHO it's not worthwhile).
|
||||||
clean_dir (&dir_copy, count);
|
clean_dir (&dir_copy, count);
|
||||||
*/
|
*/
|
||||||
|
tree_store_end_check ();
|
||||||
return next_free;
|
return next_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2221,6 +2221,7 @@ static key_map panel_keymap [] = {
|
|||||||
{ KEY_F(6), ren_cmd },
|
{ KEY_F(6), ren_cmd },
|
||||||
{ KEY_F(7), mkdir_panel_cmd },
|
{ KEY_F(7), mkdir_panel_cmd },
|
||||||
{ KEY_F(8), delete_cmd },
|
{ KEY_F(8), delete_cmd },
|
||||||
|
{ KEY_DC, delete_cmd },
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
|
@ -594,7 +594,7 @@ tree_store_start_check (char *path)
|
|||||||
if (!ts.loaded)
|
if (!ts.loaded)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
g_assert (ts.check_name == NULL);
|
g_return_val_if_fail (ts.check_name == NULL, NULL);
|
||||||
ts.check_start = NULL;
|
ts.check_start = NULL;
|
||||||
|
|
||||||
tree_store_set_freeze (TRUE);
|
tree_store_set_freeze (TRUE);
|
||||||
@ -655,7 +655,7 @@ tree_store_end_check (void)
|
|||||||
if (!ts.loaded)
|
if (!ts.loaded)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
g_assert (ts.check_name != NULL);
|
g_return_if_fail (ts.check_name != NULL);
|
||||||
|
|
||||||
/* Check delete marks and delete if found */
|
/* Check delete marks and delete if found */
|
||||||
len = strlen (ts.check_name);
|
len = strlen (ts.check_name);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user