Merge lp:~kalikiana/midori/beans into lp:midori

[Cris Dywan]

Implement libpeas extension support and example plugin

TODO: sort out libpeas/ Python on Win32 - contact dieterv in #win32 on gimpnet

[lp:~kalikiana/midori/beans]

6377. By Cris Dywan on 2013-09-01

Rename test extension to example to avoid confusion

Unmerged revisions

6377. By Cris Dywan on 2013-09-01

Rename test extension to example to avoid confusion

6376. By Cris Dywan on 2013-09-01

Implement libpeas extension support and example plugin

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-01 19:26:37 +0000
+++ CMakeLists.txt	2013-09-01 23:16:32 +0000
@@ -72,11 +72,12 @@
                   gmodule-2.0
                   gio-2.0>=2.32.3
                   libsoup-gnome-2.4>=2.27.90
+                  libpeas-1.0>=1.4
                   )
 add_definitions("-DHAVE_LIBXML")
 add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"")
 add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-gnome-2.4_VERSION}\"")
-set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4)
+set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4 libpeas-1.0)
 if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.34.0")
     set(VALAFLAGS ${VALAFLAGS} "-D;HAVE_LIBSOUP_2_34_0")
 endif ()

=== added file 'extensions/example.plugin'
--- extensions/example.plugin	1970-01-01 00:00:00 +0000
+++ extensions/example.plugin	2013-09-01 23:16:32 +0000
@@ -0,0 +1,9 @@
+[Plugin]
+Loader=python
+Module=example
+IAge=3
+Name=Example
+Name[de]=Beispiel
+Authors=Christian Dywan <[e-mail]>
+Copyright=Copyright © 2013 Christian Dywan
+Website=http://www.twotoasts.de

=== added file 'extensions/example.py'
--- extensions/example.py	1970-01-01 00:00:00 +0000
+++ extensions/example.py	2013-09-01 23:16:32 +0000
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 py-indent-offset: 4 -*-
+from gi.repository import GObject, Gtk, Peas
+import os, gettext
+
+class ExamplePlugin(GObject.Object, Peas.Activatable):
+    __gtype_name__ = "ExamplePlugin"
+    object = GObject.property(type=GObject.Object)
+
+    def __init__(self):
+        GObject.Object.__init__(self)
+
+    def do_activate(self):
+        print('Current page is %s (%s)' \
+            % (self.object.props.title, self.object.props.uri))

=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2013-08-02 18:35:37 +0000
+++ katze/midori-paths.vala	2013-09-01 23:16:32 +0000
@@ -161,6 +161,22 @@
                 stdout.printf ("config: %s\ncache: %s\nuser_data: %s\ntmp: %s\n",
                                config_dir, cache_dir, user_data_dir, tmp_dir);
             }
+
+            /* Fallback to build folder */
+            string source_extensions = Path.build_path (Path.DIR_SEPARATOR_S,
+                File.new_for_path (exec_path).get_parent ().get_path (), "extensions");
+            string lib_extensions = get_lib_path (PACKAGE_NAME);
+            if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0)
+                stdout.printf ("extensions: %s %s\n", source_extensions, lib_extensions);
+            var engine = Peas.Engine.get_default ();
+            engine.ref ();
+            engine.load_plugin.connect ((info)=>{
+                if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "extensions") == 0)
+                    stdout.printf ("Extension %s loaded\n", info.get_name ());
+            });
+            engine.enable_loader ("python");
+            engine.add_search_path (source_extensions, null);
+            engine.add_search_path (lib_extensions, null);
         }
 
         public static void mkdir_with_parents (string path, int mode = 0700) {

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2013-09-01 12:49:06 +0000
+++ midori/midori-app.c	2013-09-01 23:16:32 +0000
@@ -1247,7 +1247,7 @@
 midori_debug (const gchar* token)
 {
     static const gchar* debug_token = NULL;
-    const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed bookmarks mouse app ";
+    const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed bookmarks mouse app extensions ";
     const gchar* full_debug_tokens = "adblock:match adblock:time startup ";
     if (debug_token == NULL)
     {

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-09-01 16:40:29 +0000
+++ midori/midori-view.c	2013-09-01 23:16:32 +0000
@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <libpeas/peas.h>
+
 #ifdef HAVE_GRANITE
 #include <granite.h>
 #endif
@@ -3474,6 +3476,24 @@
 }
 #endif
 
+static void
+midori_view_extension_added (PeasExtensionSet* extensions,
+                             PeasPluginInfo*   info,
+                             PeasExtension*    extension,
+                             MidoriView*       view)
+{
+    peas_activatable_activate (PEAS_ACTIVATABLE (extension));
+}
+
+static void
+midori_view_extension_removed (PeasExtensionSet* extensions,
+                               PeasPluginInfo*   info,
+                               PeasExtension*    extension,
+                               MidoriView*       view)
+{
+    peas_activatable_deactivate (PEAS_ACTIVATABLE (extension));
+}
+
 static GObject*
 midori_view_constructor (GType                  type,
                          guint                  n_construct_properties,
@@ -3626,6 +3646,13 @@
                       NULL);
     #endif
     gtk_widget_show_all (view->scrolled_window);
+
+    PeasEngine* engine = peas_engine_get_default ();
+    PeasExtensionSet* extensions = peas_extension_set_new (engine, PEAS_TYPE_ACTIVATABLE, "object", object, NULL);
+    g_signal_connect (extensions, "extension-added", G_CALLBACK (midori_view_extension_added), object);
+    g_signal_connect (extensions, "extension-removed", G_CALLBACK (midori_view_extension_removed), object);
+    peas_extension_set_foreach (extensions, midori_view_extension_added, object);
+
     return object;
 }
 
@@ -3685,11 +3712,30 @@
                           GString*    ns_plugins,
                           gboolean    html)
 {
+    if (html)
+        g_string_append (ns_plugins, "<h2>Extensions:</h2><table>");
+    PeasEngine* engine = peas_engine_get_default ();
+    GList* pplugin, * pplugins = peas_engine_get_plugin_list (engine);
+    for (pplugin = pplugins; pplugin; pplugin = g_list_next (pplugin))
+    {
+        GError* error = NULL;
+        peas_plugin_info_is_available (pplugin->data, &error);
+        midori_view_add_version (ns_plugins, html, g_markup_printf_escaped ("%s %s (%s) %s",
+        peas_plugin_info_get_name (pplugin->data),
+        peas_plugin_info_get_version (pplugin->data),
+        peas_plugin_info_get_module_name (pplugin->data),
+        error ? error->message : (peas_plugin_info_is_loaded (pplugin->data) ? "[x]" : "[ ]")));
+        if (error)
+            g_error_free (error);
+    }
+    if (html)
+        g_string_append (ns_plugins, "</table>");
+
     if (!midori_web_settings_has_plugin_support ())
         return;
 
     if (html)
-        g_string_append (ns_plugins, "<br><h2>Netscape Plugins:</h2>");
+        g_string_append (ns_plugins, "<h2>Netscape Plugins:</h2><table>");
     else
         g_string_append_c (ns_plugins, '\n');
 
@@ -3723,6 +3769,9 @@
     }
     webkit_web_plugin_database_plugins_list_free (plugins);
     #endif
+
+    if (html)
+        g_string_append (ns_plugins, "</table>");
 }
 
 static void
@@ -4024,12 +4073,10 @@
                 midori_view_add_version (tmp, TRUE, g_markup_printf_escaped ("Identification %s",
                     ident));
                 midori_view_list_video_formats (view, tmp, TRUE);
+                g_string_append (tmp, "</table>");
 
-                g_string_append (tmp, "</table><table>");
                 midori_view_list_plugins (view, tmp, TRUE);
-                g_string_append (tmp, "</table>");
                 list_about_uris (tmp);
-                /* TODO: list active extensions */
 
                 g_string_append (tmp, "</body></html>");
                 data = g_string_free (tmp, FALSE);

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2013-08-04 19:08:38 +0000
+++ midori/midori-websettings.c	2013-09-01 23:16:32 +0000
@@ -32,6 +32,7 @@
     #include <sys/types.h>
     #include <sys/sysctl.h>
 #endif
+#include <libpeas/peas.h>
 
 #ifdef HAVE_WEBKIT2
 #define WEB_SETTINGS_STRING(x) "WebKitSettings::"x""
@@ -1459,6 +1460,9 @@
         *extensions = g_key_file_get_keys (key_file, "extensions", NULL, NULL);
     g_key_file_free (key_file);
 
+    PeasEngine* engine = peas_engine_get_default ();
+    peas_engine_set_loaded_plugins (engine, *extensions);
+
     /* Load accelerators */
     katze_assign (config_file, midori_paths_get_config_filename_for_reading ("accels"));
     if (g_access (config_file, F_OK) != 0)