Fix extension folder handling in the failing case

This commit is contained in:
Nick Schermer 2009-01-10 00:16:07 +01:00 committed by Christian Dywan
parent 626c5c904f
commit 89fbbaca46

View file

@ -1717,11 +1717,12 @@ 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))) while ((filename = g_dir_read_name (extension_dir)))
{ {
gchar* fullname; gchar* fullname;
@ -1749,6 +1750,8 @@ midori_load_extensions (gpointer data)
} }
g_dir_close (extension_dir); g_dir_close (extension_dir);
} }
g_free (extension_path);
}
g_object_set (app, "extensions", extensions, NULL); g_object_set (app, "extensions", extensions, NULL);