[totem/gnome-2-32] Initialise the GType system when called into



commit d00d5a815f5f92d1e2e0e4852a66213252e6777d
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jun 16 14:49:14 2010 +0100

    Initialise the GType system when called into
    
    Add calls to g_type_init() in the plugin entry points so that
    GThread is initialised if not already, so that GIO calls work
    as expected.
    
    Note that this requires GLib 2.24 to work properly, so only
    done in master (gnome-2-30 depends on GLib 2.22)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=621771

 browser-plugin/totemPluginGlue.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/browser-plugin/totemPluginGlue.cpp b/browser-plugin/totemPluginGlue.cpp
index fc5afc1..f14b913 100644
--- a/browser-plugin/totemPluginGlue.cpp
+++ b/browser-plugin/totemPluginGlue.cpp
@@ -315,6 +315,8 @@ NP_GetMIMEDescription (void)
 	if (mime_list != NULL)
 		return mime_list;
 
+	g_type_init ();
+
 	list = g_string_new (NULL);
 
 	/* Load the configuration files for the enabled plugins */
@@ -396,6 +398,8 @@ NP_Initialize (NPNetscapeFuncs *aMozillaVTable,
 {
 	g_debug ("NP_Initialize");
 
+	g_type_init ();
+
 	if (aMozillaVTable == NULL || aPluginVTable == NULL)
 		return NPERR_INVALID_FUNCTABLE_ERROR;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]