From cd44dc59cdfc39534aef4d417e9f3c412e3be139 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 3 Feb 2012 09:55:33 +0100
Subject: Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961
 (http://svn.webkit.org/repository/webkit/trunk@106560)

---
 Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp')

diff --git a/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp b/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
index f8b3cd240..83c5c3be2 100644
--- a/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
+++ b/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
@@ -29,12 +29,14 @@
 #include "WKBase.h"
 #include <Ecore.h>
 #include <WebCore/ResourceHandle.h>
-#include <WebKit2/RunLoop.h>
+#include <WebCore/RunLoop.h>
 #include <WebKit2/WebProcess.h>
 #include <runtime/InitializeThreading.h>
 #include <unistd.h>
 #include <wtf/MainThread.h>
 
+using namespace WebCore;
+
 namespace WebKit {
 
 WK_EXPORT int WebProcessMainEfl(int argc, char* argv[])
@@ -54,6 +56,9 @@ WK_EXPORT int WebProcessMainEfl(int argc, char* argv[])
 
 #if ENABLE(GLIB_SUPPORT)
     g_type_init();
+
+    if (!ecore_main_loop_glib_integrate())
+        return 1;
 #endif
 
     JSC::initializeThreading();
-- 
cgit v1.2.1