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

Implement MIDORI_EXTENSION_PATH environment variable

Browse source
This commit is contained in:
Christian Dywan 2009-01-16 20:22:01 +01:00
parent 50a5711b86
commit 75c54edabd
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
midori/main.c
View file

@ -1729,7 +1729,6 @@ midori_load_extensions (gpointer data)
{ {
MidoriApp* app = MIDORI_APP (data); MidoriApp* app = MIDORI_APP (data);
KatzeArray* extensions; KatzeArray* extensions;
gchar* extension_path;
const gchar* filename; const gchar* filename;
MidoriExtension* extension; MidoriExtension* extension;
guint n, i; guint n, i;
@ -1738,8 +1737,13 @@ midori_load_extensions (gpointer data)
extensions = katze_array_new (MIDORI_TYPE_EXTENSION); extensions = katze_array_new (MIDORI_TYPE_EXTENSION);
if (g_module_supported ()) if (g_module_supported ())
{ {
extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL); /* FIXME: Read extensions from system data dirs */
GDir* extension_dir = g_dir_open (extension_path, 0, NULL); gchar* extension_path;
GDir* extension_dir;
if (!(extension_path = g_strdup (g_getenv ("MIDORI_EXTENSION_PATH"))))
extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL);
extension_dir = g_dir_open (extension_path, 0, NULL);
if (extension_dir != NULL) if (extension_dir != NULL)
{ {
while ((filename = g_dir_read_name (extension_dir))) while ((filename = g_dir_read_name (extension_dir)))
@ -1749,6 +1753,10 @@ midori_load_extensions (gpointer data)
typedef MidoriExtension* (*extension_init_func)(void); typedef MidoriExtension* (*extension_init_func)(void);
extension_init_func extension_init; extension_init_func extension_init;
/* Ignore files which don't have the correct suffix */
if (!g_str_has_suffix (filename, G_MODULE_SUFFIX))
continue;
fullname = g_build_filename (extension_path, filename, NULL); fullname = g_build_filename (extension_path, filename, NULL);
module = g_module_open (fullname, G_MODULE_BIND_LOCAL); module = g_module_open (fullname, G_MODULE_BIND_LOCAL);
g_free (fullname); g_free (fullname);