[Xfce4-commits] <midori:master> Never emit 'activate' signal on active extensions

[Christian Dywan]

Updating branch refs/heads/master
         to a6396e4a2f613af9bec8087cfdfa18c2533bb7d4 (commit)
       from 09518e771615c60d96efeed8ce8cabcf34fa0fe8 (commit)

commit a6396e4a2f613af9bec8087cfdfa18c2533bb7d4
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Apr 26 20:32:25 2013 +0200

    Never emit 'activate' signal on active extensions

 midori/midori-extension.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/midori/midori-extension.c b/midori/midori-extension.c
index 4d5d63d..8541ddc 100644
--- a/midori/midori-extension.c
+++ b/midori/midori-extension.c
@@ -690,7 +690,7 @@ midori_extension_activate (GObject*     extension,
     {
         if (filename != NULL)
             midori_extension_add_to_list (app, MIDORI_EXTENSION (extension), filename);
-        if (activate)
+        if (activate && !midori_extension_is_active (MIDORI_EXTENSION (extension)))
             g_signal_emit_by_name (extension, "activate", app);
     }
     else if (KATZE_IS_ARRAY (extension))
@@ -713,7 +713,8 @@ midori_extension_activate (GObject*     extension,
                     midori_extension_add_to_list (app, extension_item, filename);
                     g_object_set_data_full (G_OBJECT (extension_item), "filename", g_strdup (filename), g_free);
                 }
-                if (activate && filename && strstr (filename, key))
+                if (activate && !midori_extension_is_active (MIDORI_EXTENSION (extension))
+                 && filename && strstr (filename, key))
                 {
                     g_signal_emit_by_name (extension_item, "activate", app);
                     success = TRUE;