Revision: 1458
http://geeqie.svn.sourceforge.net/geeqie/?rev=1458&view=rev
Author: zas_
Date: 2009-03-01 17:13:14 +0000 (Sun, 01 Mar 2009)
Log Message:
-----------
Improve file checks using is_readable_file().
Modified Paths:
--------------
trunk/src/image.c
trunk/src/layout.c
Modified: trunk/src/image.c
===================================================================
--- trunk/src/image.c 2009-03-01 17:11:51 UTC (rev 1457)
+++ trunk/src/image.c 2009-03-01 17:13:14 UTC (rev 1458)
@@ -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;
Modified: trunk/src/layout.c
===================================================================
--- trunk/src/layout.c 2009-03-01 17:11:51 UTC (rev 1457)
+++ trunk/src/layout.c 2009-03-01 17:13:14 UTC (rev 1458)
@@ -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 */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
