[EFL] Do not initialize g_type in WebProcessMain::platformInitialize()

https://bugs.webkit.org/show_bug.cgi?id=135700

Reviewed by Gyuyoung Kim.

Inspired by r171788.
Glib since 2.36 itself initializes g_type_init.

* WebProcess/efl/WebProcessMainEfl.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172371 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 5399ef0..2ad2350 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2014-08-08  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [EFL] Do not initialize g_type in WebProcessMain::platformInitialize()
+        https://bugs.webkit.org/show_bug.cgi?id=135700
+
+        Reviewed by Gyuyoung Kim.
+
+        Inspired by r171788.
+        Glib since 2.36 itself initializes g_type_init.
+
+        * WebProcess/efl/WebProcessMainEfl.cpp:
+
 2014-08-08  Tim Horton  <timothy_horton@apple.com>
 
         Build fix for 32-bit.

diff --git a/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp b/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
index cbeb322..52d0acc 100644 (file)
--- a/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
+++ b/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
@@ -95,10 +95,6 @@ public:
             return false;
         }
 
-#if !GLIB_CHECK_VERSION(2, 35, 0)
-        g_type_init();
-#endif
-
         if (!ecore_main_loop_glib_integrate())
             return false;