Mercurial > geeqie.yaz
changeset 1362:b3156b2ec4c5
Improve file checks using is_readable_file().
| author | zas_ |
|---|---|
| date | Sun, 01 Mar 2009 17:13:14 +0000 |
| parents | 84422bb8181b |
| children | d87deb05d59f |
| files | src/image.c src/layout.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Sun Mar 01 17:11:51 2009 +0000 +++ b/src/image.c Sun Mar 01 17:13:14 2009 +0000 @@ -206,7 +206,7 @@ { const gchar *file = options->color_profile.input_file[imd->color_profile_input - COLOR_PROFILE_FILE]; - if (!access_file(file, R_OK)) return FALSE; + if (!is_readable_file(file)) return FALSE; input_type = COLOR_PROFILE_FILE; input_file = file; @@ -223,7 +223,7 @@ } if (imd->color_profile_screen == 1 && - access_file(options->color_profile.screen_file, R_OK)) + is_readable_file(options->color_profile.screen_file)) { screen_type = COLOR_PROFILE_FILE; screen_file = options->color_profile.screen_file; @@ -752,7 +752,7 @@ else { - if (isfile(imd->image_fd->path)) + if (is_readable_file(imd->image_fd->path)) { PixbufRenderer *pr;
--- a/src/layout.c Sun Mar 01 17:11:51 2009 +0000 +++ b/src/layout.c Sun Mar 01 17:13:14 2009 +0000 @@ -482,7 +482,7 @@ G_CALLBACK(layout_color_menu_input_cb), lw); g_free(buf); g_object_set_data(G_OBJECT(item), COLOR_MENU_KEY, GINT_TO_POINTER(i + COLOR_PROFILE_FILE)); - gtk_widget_set_sensitive(item, active && !from_image && access_file(file, R_OK)); + gtk_widget_set_sensitive(item, active && !from_image && is_readable_file(file)); } menu_item_add_divider(menu); @@ -498,7 +498,7 @@ _("_Screen profile"), (screen == 1), G_CALLBACK(layout_color_menu_screen_cb), lw); g_object_set_data(G_OBJECT(item), COLOR_MENU_KEY, GINT_TO_POINTER(1)); - gtk_widget_set_sensitive(item, active && access_file(options->color_profile.screen_file, R_OK)); + gtk_widget_set_sensitive(item, active && is_readable_file(options->color_profile.screen_file)); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME); #endif /* HAVE_LCMS */