Look for extensions relative to program folder on win32

This commit is contained in:
Peter de Ridder 2010-02-16 00:42:39 +01:00 committed by Christian Dywan
parent f4b2111b40
commit c90344ac44

View file

@ -1076,7 +1076,22 @@ midori_load_extensions (gpointer data)
GDir* extension_dir; GDir* extension_dir;
if (!(extension_path = g_strdup (g_getenv ("MIDORI_EXTENSION_PATH")))) if (!(extension_path = g_strdup (g_getenv ("MIDORI_EXTENSION_PATH"))))
{
#ifdef G_OS_WIN32
{
gchar *path = g_win32_get_package_installation_directory_of_module (NULL);
extension_path = g_build_filename (path, "lib", PACKAGE_NAME, NULL);
g_free (path);
if (g_access (extension_path, F_OK) != 0)
{
g_free (extension_path);
extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL);
}
}
#else
extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL);
#endif
}
extension_dir = g_dir_open (extension_path, 0, NULL); extension_dir = g_dir_open (extension_path, 0, NULL);
if (extension_dir != NULL) if (extension_dir != NULL)
{ {