Mercurial > geeqie.yaz
comparison src/main.c @ 341:15c6b94545a2
Move safe_delete* and in place rename options to file_ops
struct.
Re-order rc file a bit.
author | zas_ |
---|---|
date | Sat, 12 Apr 2008 22:04:29 +0000 |
parents | 77103f3f2cb1 |
children | 5c82855feba7 |
comparison
equal
deleted
inserted
replaced
340:77103f3f2cb1 | 341:15c6b94545a2 |
---|---|
1167 g_free(path); | 1167 g_free(path); |
1168 path = concat_dir_and_file(homedir(), GQ_RC_DIR_COLLECTIONS); | 1168 path = concat_dir_and_file(homedir(), GQ_RC_DIR_COLLECTIONS); |
1169 bookmark_add_default(_("Collections"), path); | 1169 bookmark_add_default(_("Collections"), path); |
1170 g_free(path); | 1170 g_free(path); |
1171 | 1171 |
1172 g_free(options->safe_delete_path); | 1172 g_free(options->file_ops.safe_delete_path); |
1173 options->safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH); | 1173 options->file_ops.safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH); |
1174 | 1174 |
1175 for (i = 0; i < COLOR_PROFILE_INPUTS; i++) | 1175 for (i = 0; i < COLOR_PROFILE_INPUTS; i++) |
1176 { | 1176 { |
1177 options->color_profile.input_file[i] = NULL; | 1177 options->color_profile.input_file[i] = NULL; |
1178 options->color_profile.input_name[i] = NULL; | 1178 options->color_profile.input_name[i] = NULL; |