Merge "Removed warning - use of deprecated function" into tizen
authorKibak Yoon <kibak.yoon@samsung.com>
Mon, 5 Jan 2015 01:09:52 +0000 (17:09 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 5 Jan 2015 01:09:52 +0000 (17:09 -0800)
src/server/dbus_util.cpp

index f3a0ca5..662be73 100755 (executable)
@@ -103,7 +103,10 @@ static void on_name_lost(GDBusConnection *conn,
 
 void init_dbus(void)
 {
+
+       #ifndef GLIB_VERSION_2_36
        g_type_init();
+       #endif
 
        introspection_data = g_dbus_node_info_new_for_xml(introspection_xml, NULL);
        if (introspection_data == NULL) {