diff options
| author | Tomas Bzatek <tbzatek@redhat.com> | 2010-07-19 18:09:31 +0200 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2010-07-19 18:09:31 +0200 |
| commit | f81a4d4628a7b9cd27293ade19ae6649b4a55e45 (patch) | |
| tree | f53a54933a52b155a3df0614c5bace84aef7492f /src/setup.c | |
| parent | d9dd375a6d6090274fde3d57b30788195f48755a (diff) | |
| download | cataract-f81a4d4628a7b9cd27293ade19ae6649b4a55e45.tar.xz | |
Silence error messages when searching for setup file
Also print the setup file path in verbose mode.
Diffstat (limited to 'src/setup.c')
| -rw-r--r-- | src/setup.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/setup.c b/src/setup.c index 7f7caf9..f394838 100644 --- a/src/setup.c +++ b/src/setup.c @@ -27,6 +27,7 @@ #include <libxml/xpathInternals.h> #include <glib.h> +#include <glib/gstdio.h> #include <config.h> @@ -46,23 +47,27 @@ find_setup_xml (TGallerySetup *setup) gchar *cwd; gboolean b; + b = FALSE; cwd = g_get_current_dir (); pth = g_strconcat (cwd, "/", SETUP_XML, NULL); g_free (cwd); - b = parse_setup_xml (pth, setup); + if (g_access (pth, R_OK) == 0) + b = parse_setup_xml (pth, setup); g_free (pth); if (b) return TRUE; pth = g_strconcat (g_getenv ("HOME"), "/.cgg/", SETUP_XML, NULL); - b = parse_setup_xml (pth, setup); + if (g_access (pth, R_OK) == 0) + b = parse_setup_xml (pth, setup); g_free (pth); if (b) return TRUE; pth = g_strconcat (DATADIR, "/cgg/", SETUP_XML, NULL); - b = parse_setup_xml (pth, setup); + if (g_access (pth, R_OK) == 0) + b = parse_setup_xml (pth, setup); g_free (pth); return b; } |