Mercurial > geeqie
comparison src/utilops.c @ 897:6c676d3eef5b
fixed previous checkin
author | nadvornik |
---|---|
date | Sun, 20 Jul 2008 11:29:12 +0000 |
parents | cf21dc928122 |
children | dc13766d1eeb |
comparison
equal
deleted
inserted
replaced
896:cf21dc928122 | 897:6c676d3eef5b |
---|---|
441 | 441 |
442 return view; | 442 return view; |
443 } | 443 } |
444 | 444 |
445 | 445 |
446 void file_util_perform_ci_internal(UtilityData *ud); | 446 static void file_util_perform_ci_internal(UtilityData *ud); |
447 void file_util_dialog_run(UtilityData *ud); | 447 void file_util_dialog_run(UtilityData *ud); |
448 static gint file_util_perform_ci_cb(gpointer resume_data, gint flags, GList *list, gpointer data); | 448 static gint file_util_perform_ci_cb(gpointer resume_data, gint flags, GList *list, gpointer data); |
449 | 449 |
450 /* call file_util_perform_ci_internal or start_editor_from_filelist_full */ | 450 /* call file_util_perform_ci_internal or start_editor_from_filelist_full */ |
451 | 451 |
578 { | 578 { |
579 switch (ud->type) | 579 switch (ud->type) |
580 { | 580 { |
581 case UTILITY_TYPE_DELETE_LINK: | 581 case UTILITY_TYPE_DELETE_LINK: |
582 { | 582 { |
583 if (internal && file_data_sc_perform_ci(ud->dir_fd) || | 583 if ((internal && file_data_sc_perform_ci(ud->dir_fd)) || |
584 !internal && ext_result) | 584 (!internal && ext_result)) |
585 { | 585 { |
586 file_data_sc_apply_ci(ud->dir_fd); | 586 file_data_sc_apply_ci(ud->dir_fd); |
587 } | 587 } |
588 else | 588 else |
589 { | 589 { |
609 fd = work->data; | 609 fd = work->data; |
610 work = work->next; | 610 work = work->next; |
611 | 611 |
612 if (!fail) | 612 if (!fail) |
613 { | 613 { |
614 if (internal && file_data_sc_perform_ci(fd) || | 614 if ((internal && file_data_sc_perform_ci(fd)) || |
615 !internal && ext_result) | 615 (!internal && ext_result)) |
616 { | 616 { |
617 file_data_sc_apply_ci(fd); | 617 file_data_sc_apply_ci(fd); |
618 } | 618 } |
619 else | 619 else |
620 { | 620 { |
624 file_data_sc_free_ci(fd); | 624 file_data_sc_free_ci(fd); |
625 } | 625 } |
626 | 626 |
627 if (!fail) | 627 if (!fail) |
628 { | 628 { |
629 if (internal && file_data_sc_perform_ci(ud->dir_fd) || | 629 if ((internal && file_data_sc_perform_ci(ud->dir_fd)) || |
630 !internal && ext_result) | 630 (!internal && ext_result)) |
631 { | 631 { |
632 file_data_sc_apply_ci(ud->dir_fd); | 632 file_data_sc_apply_ci(ud->dir_fd); |
633 } | 633 } |
634 else | 634 else |
635 { | 635 { |
661 } | 661 } |
662 case UTILITY_TYPE_RENAME_FOLDER: | 662 case UTILITY_TYPE_RENAME_FOLDER: |
663 { | 663 { |
664 FileData *fail = NULL; | 664 FileData *fail = NULL; |
665 GList *work; | 665 GList *work; |
666 if (internal && file_data_sc_perform_ci(ud->dir_fd) || | 666 if ((internal && file_data_sc_perform_ci(ud->dir_fd)) || |
667 !internal && ext_result) | 667 (!internal && ext_result)) |
668 { | 668 { |
669 file_data_sc_apply_ci(ud->dir_fd); | 669 file_data_sc_apply_ci(ud->dir_fd); |
670 } | 670 } |
671 else | 671 else |
672 { | 672 { |