Updating branch refs/heads/master
to 3428fbb586ce2074b26364266641d798b31a571d (commit)
from e5a793c9e7045daa6325d5dc64dddc519aad2e17 (commit)
commit 3428fbb586ce2074b26364266641d798b31a571d
Author: Vincent Cappe <[email protected]>
Date: Thu Apr 12 02:35:14 2012 +0200
Update extension test to extension_init changes
tests/extensions.c | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/tests/extensions.c b/tests/extensions.c
index 22b6853..a5baa1f 100644
--- a/tests/extensions.c
+++ b/tests/extensions.c
@@ -166,13 +166,25 @@ extension_settings (void)
static void
extension_activate (gconstpointer data)
{
+ MidoriExtension* extension;
MidoriApp* app = midori_app_new ();
- MidoriExtension* extension = MIDORI_EXTENSION (data);
- if (extension == NULL)
- return;
g_object_set (app, "settings", midori_web_settings_new (), NULL);
- g_signal_emit_by_name (extension, "activate", app);
- midori_extension_deactivate (extension);
+
+ if (MIDORI_IS_EXTENSION (data))
+ {
+ extension = MIDORI_EXTENSION (data);
+ g_signal_emit_by_name (extension, "activate", app);
+ midori_extension_deactivate (extension);
+ }
+ else if (KATZE_IS_ARRAY (data))
+ {
+ KATZE_ARRAY_FOREACH_ITEM (extension, KATZE_ARRAY (data))
+ {
+ g_signal_emit_by_name (extension, "activate", app);
+ midori_extension_deactivate (extension);
+ }
+ }
+
g_object_unref (app);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
