From fa5d7c1aa69ee8b4cf49c5e3cfe291e2f503f815 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Mon, 8 Oct 2012 13:44:24 +0200
Subject: Call g_type_init() in the constructor for QDBusObject. This ensures
 it is always called where needed: clients don’t need to invoke it themselves.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libqmenumodel/QMenuModel/plugin.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'libqmenumodel/QMenuModel/plugin.cpp')

diff --git a/libqmenumodel/QMenuModel/plugin.cpp b/libqmenumodel/QMenuModel/plugin.cpp
index 26650eb..ee05fff 100644
--- a/libqmenumodel/QMenuModel/plugin.cpp
+++ b/libqmenumodel/QMenuModel/plugin.cpp
@@ -17,10 +17,6 @@
  *      Renato Araujo Oliveira Filho <renato@canonical.com>
  */
 
-extern "C" {
-#include <glib-object.h>
-}
-
 #include "plugin.h"
 #include "qmenumodel.h"
 #include "qdbusmenumodel.h"
@@ -31,7 +27,6 @@ extern "C" {
 
 void QMenuModelQmlPlugin::registerTypes(const char *uri)
 {
-    g_type_init();
     qmlRegisterUncreatableType<QMenuModel>(uri, 0, 1, "QMenuModel",
                                            "QMenuModel is a interface");
     qmlRegisterUncreatableType<QStateAction>(uri, 0, 1, "QStateAction",
-- 
cgit v1.2.3