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

Fix extension folder handling in the failing case

Browse source
This commit is contained in:
Nick Schermer 2009-01-10 00:16:07 +01:00 committed by Christian Dywan
parent 626c5c904f
commit 89fbbaca46
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
midori/main.c
View file

@ -1717,37 +1717,40 @@ midori_load_extensions (gpointer data)
/* Load extensions */ /* Load extensions */
extensions = katze_array_new (MIDORI_TYPE_EXTENSION); extensions = katze_array_new (MIDORI_TYPE_EXTENSION);
extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL);
if (g_module_supported ()) if (g_module_supported ())
{ {
extension_path = g_build_filename (LIBDIR, PACKAGE_NAME, NULL);
GDir* extension_dir = g_dir_open (extension_path, 0, NULL); GDir* extension_dir = g_dir_open (extension_path, 0, NULL);
if (extension_dir != NULL)
while ((filename = g_dir_read_name (extension_dir)))
{ {
gchar* fullname; while ((filename = g_dir_read_name (extension_dir)))
GModule* module;
typedef MidoriExtension* (*extension_init_func)(void);
extension_init_func extension_init;
fullname = g_build_filename (extension_path, filename, NULL);
module = g_module_open (fullname, G_MODULE_BIND_LOCAL);
g_free (fullname);
if (module && g_module_symbol (module, "extension_init",
(gpointer) &extension_init))
extension = extension_init ();
else
{ {
extension = g_object_new (MIDORI_TYPE_EXTENSION, gchar* fullname;
"name", filename, GModule* module;
"description", g_module_error (), typedef MidoriExtension* (*extension_init_func)(void);
NULL); extension_init_func extension_init;
g_warning ("%s", g_module_error ());
fullname = g_build_filename (extension_path, filename, NULL);
module = g_module_open (fullname, G_MODULE_BIND_LOCAL);
g_free (fullname);
if (module && g_module_symbol (module, "extension_init",
(gpointer) &extension_init))
extension = extension_init ();
else
{
extension = g_object_new (MIDORI_TYPE_EXTENSION,
"name", filename,
"description", g_module_error (),
NULL);
g_warning ("%s", g_module_error ());
}
katze_array_add_item (extensions, extension);
g_object_unref (extension);
} }
katze_array_add_item (extensions, extension); g_dir_close (extension_dir);
g_object_unref (extension);
} }
g_dir_close (extension_dir); g_free (extension_path);
} }
g_object_set (app, "extensions", extensions, NULL); g_object_set (app, "extensions", extensions, NULL);