Revision 1850 trunk/nntpgrab_core/configuration.c

configuration.c (revision 1850)
643 643
        config->opts.enable_webserver = FALSE;
644 644
        config->opts.webserver_port = 5423;
645 645
        config->opts.enable_logger = FALSE;
646
        config->opts.auto_remove_files = FALSE;
646
        config->opts.auto_remove_files_after_repair = FALSE;
647
        config->opts.auto_remove_files_after_unpack = FALSE;
647 648

                
648 649
        g_static_rw_lock_writer_unlock(&config->rwlock);
649 650

                
... ...
739 740
                config->opts.enable_logger = FALSE;
740 741
            }
741 742

                
742
            if (g_key_file_has_key(keyfile, groups[i], "auto_remove_files", NULL)) {
743
                config->opts.auto_remove_files = g_key_file_get_boolean(keyfile, groups[i], "auto_remove_files", NULL);
743
            if (g_key_file_has_key(keyfile, groups[i], "auto_remove_files_after_repair", NULL)) {
744
                config->opts.auto_remove_files_after_repair = g_key_file_get_boolean(keyfile, groups[i], "auto_remove_files_after_repair", NULL);
744 745
            } else {
745
                config->opts.auto_remove_files = FALSE;
746
                config->opts.auto_remove_files_after_repair = FALSE;
746 747
            }
747 748

                
749
            if (g_key_file_has_key(keyfile, groups[i], "auto_remove_files_after_unpack", NULL)) {
750
                config->opts.auto_remove_files_after_unpack = g_key_file_get_boolean(keyfile, groups[i], "auto_remove_files_after_unpack", NULL);
751
            } else {
752
                config->opts.auto_remove_files_after_unpack = FALSE;
753
            }
754

                
755
            /* backwards compatibility */
756
            if (g_key_file_has_key(keyfile, groups[i], "auto_remove_files", NULL)) {
757
                config->opts.auto_remove_files_after_repair = g_key_file_get_boolean(keyfile, groups[i], "auto_remove_files", NULL);
758
                config->opts.auto_remove_files_after_unpack = g_key_file_get_boolean(keyfile, groups[i], "auto_remove_files", NULL);
759
            }
748 760
            i++;
749 761
            continue;
750 762
        }
... ...
906 918
    g_key_file_set_boolean(keyfile, "options", "enable_webserver", config->opts.enable_webserver);
907 919
    g_key_file_set_integer(keyfile, "options", "webserver_port", config->opts.webserver_port);
908 920
    g_key_file_set_boolean(keyfile, "options", "enable_logger", config->opts.enable_logger);
909
    g_key_file_set_boolean(keyfile, "options", "auto_remove_files", config->opts.auto_remove_files);
921
    g_key_file_set_boolean(keyfile, "options", "auto_remove_files_after_repair", config->opts.auto_remove_files_after_repair);
922
    g_key_file_set_boolean(keyfile, "options", "auto_remove_files_after_unpack", config->opts.auto_remove_files_after_unpack);
910 923

                
911 924
    list = config->servers;
912 925
    while (list) {

Also available in: Unified diff