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

Allow more than one extenstion for each module

Browse source
This commit is contained in:
André Stösel 2012-03-26 19:15:02 +02:00 committed by Christian Dywan
parent dc19951a21
commit ebf2c2d1d9
1 changed files with 47 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
midori/main.c
View file

@ -1226,6 +1226,34 @@ midori_load_soup_session_full (gpointer settings)
return FALSE; return FALSE;
} }
static void
midori_load_extension (MidoriApp* app,
KatzeArray* extensions,
gchar** active_extensions,
MidoriExtension* extension,
const gchar* filename)
{
/* Signal that we want the extension to load and save */
g_object_set_data_full (G_OBJECT (extension), "filename",
g_strdup (filename), g_free);
if (midori_extension_is_prepared (extension))
midori_extension_get_config_dir (extension);
katze_array_add_item (extensions, extension);
if (active_extensions)
{
guint i = 0;
gchar* name;
while ((name = active_extensions[i++]))
if (!g_strcmp0 (filename, name))
g_signal_emit_by_name (extension, "activate", app);
}
g_signal_connect_after (extension, "activate",
G_CALLBACK (extension_activate_cb), app);
g_signal_connect_after (extension, "deactivate",
G_CALLBACK (extension_activate_cb), app);
}
static gboolean static gboolean
midori_load_extensions (gpointer data) midori_load_extensions (gpointer data)
{ {
@ -1257,9 +1285,9 @@ midori_load_extensions (gpointer data)
{ {
gchar* fullname; gchar* fullname;
GModule* module; GModule* module;
typedef MidoriExtension* (*extension_init_func)(void); typedef GObject* (*extension_init_func)(void);
extension_init_func extension_init; extension_init_func extension_init;
MidoriExtension* extension = NULL; GObject* extension = NULL;
/* Ignore files which don't have the correct suffix */ /* Ignore files which don't have the correct suffix */
if (!g_str_has_suffix (filename, G_MODULE_SUFFIX)) if (!g_str_has_suffix (filename, G_MODULE_SUFFIX))
@ -1275,11 +1303,22 @@ midori_load_extensions (gpointer data)
extension = extension_init (); extension = extension_init ();
if (extension != NULL) if (extension != NULL)
{ {
/* Signal that we want the extension to load and save */ if (MIDORI_IS_EXTENSION (extension))
g_object_set_data_full (G_OBJECT (extension), "filename", midori_load_extension (app, extensions,
g_strdup (filename), g_free); active_extensions,
if (midori_extension_is_prepared (extension)) MIDORI_EXTENSION (extension), filename);
midori_extension_get_config_dir (extension); else if (KATZE_IS_ARRAY (extension))
{
MidoriExtension* extension_item;
KATZE_ARRAY_FOREACH_ITEM (extension_item, KATZE_ARRAY (extension))
{
if (MIDORI_IS_EXTENSION (extension))
midori_load_extension (app, extensions,
active_extensions, extension_item,
filename);
}
}
} }
} }
@ -1294,20 +1333,8 @@ midori_load_extensions (gpointer data)
"description", g_module_error (), "description", g_module_error (),
NULL); NULL);
g_warning ("%s", g_module_error ()); g_warning ("%s", g_module_error ());
katze_array_add_item (extensions, extension);
} }
katze_array_add_item (extensions, extension);
if (active_extensions)
{
guint i = 0;
gchar* name;
while ((name = active_extensions[i++]))
if (!g_strcmp0 (filename, name))
g_signal_emit_by_name (extension, "activate", app);
}
g_signal_connect_after (extension, "activate",
G_CALLBACK (extension_activate_cb), app);
g_signal_connect_after (extension, "deactivate",
G_CALLBACK (extension_activate_cb), app);
g_object_unref (extension); g_object_unref (extension);
} }
g_dir_close (extension_dir); g_dir_close (extension_dir);