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

Check for folders other than LIBDIR in sokoke_find_lib_path

Browse source
This commit is contained in:
Paweł Forysiuk 2011-08-29 19:13:24 +02:00 committed by Christian Dywan
parent c1321b0072
commit 18a0d1da03
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
midori/sokoke.c
View file

@ -1732,9 +1732,23 @@ gchar* sokoke_find_lib_path (const gchar* folder)
if (g_access (lib_path, F_OK) == 0) if (g_access (lib_path, F_OK) == 0)
return lib_path; return lib_path;
#else #else
gchar* lib_path = g_build_filename (LIBDIR, folder ? folder : "", NULL); const gchar* lib_dirs[] =
{
LIBDIR,
"/usr/local/lib",
"/usr/lib",
NULL
};
guint i;
for (i = 0; i < G_N_ELEMENTS (lib_dirs); i++)
{
gchar* lib_path = g_build_filename (lib_dirs[i], folder ? folder : "", NULL);
if (g_access (lib_path, F_OK) == 0) if (g_access (lib_path, F_OK) == 0)
return lib_path; return lib_path;
else
g_free (lib_path);
}
#endif #endif
return NULL; return NULL;