debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Check user data dir first for resource files

Browse source
This commit is contained in:
Peter de Ridder 2010-05-16 17:47:21 +02:00 committed by Christian Dywan
parent 0fca240bf6
commit 486ebfb930
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/sokoke.c
View file

@ -1483,7 +1483,7 @@ sokoke_find_config_filename (const gchar* folder,
* Looks for the specified filename in the system data * Looks for the specified filename in the system data
* directories, depending on the platform. * directories, depending on the platform.
* *
* Return value: a full path * Return value: a newly allocated full path
**/ **/
gchar* gchar*
sokoke_find_data_filename (const gchar* filename) sokoke_find_data_filename (const gchar* filename)
@ -1491,10 +1491,16 @@ sokoke_find_data_filename (const gchar* filename)
const gchar* const* data_dirs = g_get_system_data_dirs (); const gchar* const* data_dirs = g_get_system_data_dirs ();
guint i = 0; guint i = 0;
const gchar* data_dir; const gchar* data_dir;
gchar* path;
path = g_build_filename (g_get_user_data_dir (), filename, NULL);
if (g_access (path, F_OK) == 0)
return path;
g_free (path);
while ((data_dir = data_dirs[i++])) while ((data_dir = data_dirs[i++]))
{ {
gchar* path = g_build_filename (data_dir, filename, NULL); path = g_build_filename (data_dir, filename, NULL);
if (g_access (path, F_OK) == 0) if (g_access (path, F_OK) == 0)
return path; return path;
g_free (path); g_free (path);