Merge lp:~linaro-graphics-wg/unity/ubus-gtypeinit into lp:unity

[Alexandros Frantzis]

ubus: Ensure the GType system has been initialized before using any GTypes.

The unity plugin doesn't explicitly call g_type_init(), although it uses a
GObject for UBusServer. This currently works because the ccp plugin, which
gets loaded before the unity plugin, calls g_type_init(), but this is fragile.
If ccp is not used, g_type_init() is not called by the time UBusServer gets
initialized, leading to a crash. This patch ensures that the GType system
has been initialized before using UBusServer (it is safe to call g_type_init()
multiple times).

ubus: Ensure the GType system has been initialized before using any GTypes.

The unity plugin doesn't explicitly call g_type_init(), although it uses a
GObject for UBusServer. This currently works because the ccp plugin, which
gets loaded before the unity plugin, calls g_type_init(), but this is fragile.
If ccp is not used, g_type_init() is not called by the time UBusServer gets
initialized, leading to a crash. This patch ensures that the GType system
has been initialized before using UBusServer (it is safe to call g_type_init()
multiple times).

[Jay Taoko (jaytaoko)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'plugins/unityshell/src/ubus-server.cpp'
--- plugins/unityshell/src/ubus-server.cpp	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/ubus-server.cpp	2012-03-16 11:38:26 +0000
@@ -195,6 +195,9 @@
   UBusServer* server;
   static gsize singleton;
 
+  // Ensure GType has been initialized
+  g_type_init();
+
   if (g_once_init_enter(&singleton))
   {
     server = (UBusServer*)g_object_new(UBUS_TYPE_SERVER, NULL);