[Xfce4-commits] <midori:master> Omit Transfers extension from array of all extensions

[Christian Dywan]

Updating branch refs/heads/master
         to 9fd03f325c45de86496dc1fe629dd479b010829c (commit)
       from c7ec6225878af3257f25594813f5814ff397fb82 (commit)

commit 9fd03f325c45de86496dc1fe629dd479b010829c
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed May 8 01:14:12 2013 +0200

    Omit Transfers extension from array of all extensions
    
    It shouldn't be de-activatable or show up in UI.

 midori/midori-extension.c |   12 +++++++++---
 midori/midori-extension.h |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/midori/midori-extension.c b/midori/midori-extension.c
index c7ac5ca..7fd76c0 100644
--- a/midori/midori-extension.c
+++ b/midori/midori-extension.c
@@ -559,8 +559,8 @@ midori_extension_load_from_folder (MidoriApp* app,
         while (keys && (filename = keys[i++]))
             midori_extension_activate_gracefully (app, extension_path, filename, activate);
         /* FIXME need proper stock extension mechanism */
-        midori_extension_activate_gracefully (app, extension_path, "libtransfers." G_MODULE_SUFFIX, activate);
-        g_assert (g_module_error () == NULL);
+        GObject* extension = midori_extension_activate_gracefully (app, extension_path, "libtransfers." G_MODULE_SUFFIX, activate);
+        g_assert (extension != NULL);
     }
     else
     {
@@ -634,7 +634,7 @@ midori_extension_load_from_file (const gchar* extension_path,
     return extension;
 }
 
-void
+GObject*
 midori_extension_activate_gracefully (MidoriApp*   app,
                                       const gchar* extension_path,
                                       const gchar* filename,
@@ -654,7 +654,10 @@ midori_extension_activate_gracefully (MidoriApp*   app,
         katze_array_add_item (extensions, extension);
         g_object_unref (extensions);
         g_object_unref (extension);
+        return NULL;
     }
+    else
+        return extension;
 }
 
 static void
@@ -668,6 +671,9 @@ midori_extension_add_to_list (MidoriApp*       app,
     g_return_if_fail (KATZE_IS_ARRAY (extensions));
     if (katze_array_get_item_index (extensions, extension) >= 0)
         return;
+    /* FIXME need proper stock extension mechanism */
+    if (!strcmp (filename, "libtransfers." G_MODULE_SUFFIX))
+        return;
 
     katze_array_add_item (extensions, extension);
     g_object_unref (extensions);
diff --git a/midori/midori-extension.h b/midori/midori-extension.h
index adda774..5cf666b 100644
--- a/midori/midori-extension.h
+++ b/midori/midori-extension.h
@@ -60,7 +60,7 @@ midori_extension_activate           (GObject*     extension,
                                      gboolean     activate,
                                      MidoriApp*   app);
 
-void
+GObject*
 midori_extension_activate_gracefully (MidoriApp*   app,
                                       const gchar* extension_path,
                                       const gchar* filename,