Revision: 1971 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1971&view=re... Author: colombanw Date: 2011-03-10 15:48:00 +0000 (Thu, 10 Mar 2011)

Log Message: ----------- WebHelper: Initialize GLib's threading system for WebKit to use it

WebKit uses threads but don't seem to initialize the thread system, causing troubles with GLib versions that doesn't enable threads by default (< 2.24). So, initialize the thread system ourselves.

Closes #3189033

Modified Paths: -------------- trunk/geany-plugins/build/webhelper.m4 trunk/geany-plugins/webhelper/src/gwh-plugin.c

Modified: trunk/geany-plugins/build/webhelper.m4 =================================================================== --- trunk/geany-plugins/build/webhelper.m4 2011-03-10 15:47:35 UTC (rev 1970) +++ trunk/geany-plugins/build/webhelper.m4 2011-03-10 15:48:00 UTC (rev 1971) @@ -23,7 +23,8 @@ glib-2.0 >= ${GLIB_VERSION} gio-2.0 >= ${GIO_VERSION} gdk-pixbuf-2.0 >= ${GDK_PIXBUF_VERSION} - webkit-1.0 >= ${WEBKIT_VERSION}]) + webkit-1.0 >= ${WEBKIT_VERSION} + gthread-2.0])

GP_STATUS_PLUGIN_ADD([WebHelper], [$enable_webhelper])

Modified: trunk/geany-plugins/webhelper/src/gwh-plugin.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-plugin.c 2011-03-10 15:47:35 UTC (rev 1970) +++ trunk/geany-plugins/webhelper/src/gwh-plugin.c 2011-03-10 15:48:00 UTC (rev 1971) @@ -416,6 +416,11 @@ * (g_quark_from_static_string() for example) so it's not safe to remove it */ plugin_module_make_resident (geany_plugin);

+ /* webkit uses threads but don't initialize the thread system */ + if (! g_thread_supported ()) { + g_thread_init (NULL); + } + load_config (); gwh_keybindings_init ();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.