Adding missing wayland initialization. 16/5216/1
authorKondapally Kalyan <kalyan.kondapally@intel.com>
Mon, 1 Jul 2013 17:03:36 +0000 (20:03 +0300)
committerKondapally Kalyan <kalyan.kondapally@intel.com>
Mon, 1 Jul 2013 17:03:36 +0000 (20:03 +0300)
The patch adds missing calls for ecore initializtion
on wayland.

Change-Id: Ia243ce2ebb0d0e8edce2d357b2efbbd4613ccb7f

Source/WebKit2/PluginProcess/efl/PluginProcessMainEfl.cpp
Source/WebKit2/UIProcess/API/efl/ewk_main.cpp

index 8bdb54e..018ca50 100755 (executable)
@@ -32,6 +32,8 @@
 #include <Ecore.h>
 #ifdef HAVE_ECORE_X
 #include <Ecore_X.h>
+#else
+#include <Ecore_Wayland.h>
 #endif
 #include <WebCore/RunLoop.h>
 #include <runtime/InitializeThreading.h>
@@ -81,6 +83,9 @@ WK_EXPORT int PluginProcessMainEfl(int argc, char* argv[])
 #ifdef HAVE_ECORE_X
     if (!ecore_x_init(0))
         return 1;
+#else
+    if(!ecore_wl_init(0))
+        return 1;
 #endif
 
     JSC::initializeThreading();
index 61c6e76..5c4ffcd 100755 (executable)
@@ -37,6 +37,8 @@
 
 #ifdef HAVE_ECORE_X
 #include <Ecore_X.h>
+#else
+#include <Ecore_Wayland.h>
 #endif
 
 static int _ewkInitCount = 0;
@@ -89,6 +91,11 @@ int ewk_init(void)
         CRITICAL("could not init ecore_x.");
         goto error_ecore_x;
     }
+#else
+    if(!ecore_wl_init(0)) {
+        CRITICAL("could not init ecore_wl.");
+        goto error_ecore_wl;
+    }
 #endif
 
     g_type_init();
@@ -103,6 +110,9 @@ int ewk_init(void)
 #ifdef HAVE_ECORE_X
 error_ecore_x:
     ecore_imf_shutdown();
+#else
+error_ecore_wl:
+    ecore_imf_shutdown();
 #endif
 error_ecore_imf:
     ecore_evas_shutdown();