summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/UIProcess/API/efl/ewk_main.cpp')
-rw-r--r--Source/WebKit2/UIProcess/API/efl/ewk_main.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp b/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp
index fcc9faf1a..17e2b1eea 100644
--- a/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_main.cpp
@@ -31,6 +31,10 @@
#include <glib-object.h>
#include <glib.h>
+#ifdef HAVE_ECORE_X
+#include <Ecore_X.h>
+#endif
+
static int _ewkInitCount = 0;
/**
@@ -68,6 +72,13 @@ int ewk_init(void)
goto error_ecore_evas;
}
+#ifdef HAVE_ECORE_X
+ if (!ecore_x_init(0)) {
+ CRITICAL("could not init ecore_x.");
+ goto error_ecore_x;
+ }
+#endif
+
g_type_init();
if (!ecore_main_loop_glib_integrate()) {
@@ -77,6 +88,10 @@ int ewk_init(void)
return ++_ewkInitCount;
+#ifdef HAVE_ECORE_X
+error_ecore_x:
+ ecore_evas_shutdown();
+#endif
error_ecore_evas:
ecore_shutdown();
error_ecore:
@@ -95,6 +110,9 @@ int ewk_shutdown(void)
if (--_ewkInitCount)
return _ewkInitCount;
+#ifdef HAVE_ECORE_X
+ ecore_x_shutdown();
+#endif
ecore_evas_shutdown();
ecore_shutdown();
evas_shutdown();