Change deprecated pkg to the new one, efl-assist to efl-extension

Change-Id: I849467d6ef0cc5a2b2dfaa30b0c1d50d1f9f8d86

diff --git a/packaging/wrt.spec b/packaging/wrt.spec
index 4cf20db..04bafed 100755 (executable)
--- a/packaging/wrt.spec
+++ b/packaging/wrt.spec
@@ -29,7 +29,7 @@ BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(manifest-parser)
 BuildRequires: pkgconfig(manifest-handlers)
 BuildRequires: pkgconfig(capi-appfw-package-manager)
-BuildRequires: pkgconfig(efl-assist)
+BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(deviced)
 BuildRequires: pkgconfig(capi-system-system-settings)
 BuildRequires: pkgconfig(cert-svc)

diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
index 5d54bd5..d3ba046 100755 (executable)
--- a/src/runtime/CMakeLists.txt
+++ b/src/runtime/CMakeLists.txt
@@ -28,7 +28,7 @@ PKG_CHECK_MODULES(TARGET_RUNTIME_DEPS
   elementary
   capi-appfw-application
   chromium-efl
-  efl-assist
+  efl-extension
   deviced
   ecore
   notification

diff --git a/src/runtime/popup.cc b/src/runtime/popup.cc
index 974113a..3fc70f3 100755 (executable)
--- a/src/runtime/popup.cc
+++ b/src/runtime/popup.cc
@@ -17,8 +17,6 @@
 
 #include "runtime/popup.h"
 
-#include <efl_assist.h>
-
 #include "runtime/native_window.h"
 #include "runtime/popup_string.h"
 #include "common/logger.h"

diff --git a/src/runtime/web_view_impl.cc b/src/runtime/web_view_impl.cc
index 8f52a04..7f51c1e 100755 (executable)
--- a/src/runtime/web_view_impl.cc
+++ b/src/runtime/web_view_impl.cc
@@ -156,8 +156,8 @@ void WebViewImpl::Deinitialize() {
         it->first.c_str(),
         it->second);
   }
-  ea_object_event_callback_del(ewk_view_,
-                               EA_CALLBACK_BACK,
+  eext_object_event_callback_del(ewk_view_,
+                               EEXT_CALLBACK_BACK,
                                smart_callbacks_["key_callback"]);
   ewk_view_exceeded_database_quota_callback_set(
       ewk_view_,
@@ -191,16 +191,16 @@ void WebViewImpl::InitKeyCallback() {
                          Evas_Object* /*obj*/,
                          void* event_info) -> void {
     WebViewImpl* self = static_cast<WebViewImpl*>(user_data);
-    Ea_Callback_Type key = static_cast<Ea_Callback_Type>(
+    Eext_Callback_Type key = static_cast<Eext_Callback_Type>(
       reinterpret_cast<long long>(event_info)); // for 64-bit
     self->OnKeyEvent(key);
   };
-  ea_object_event_callback_add(ewk_view_,
-                               EA_CALLBACK_BACK,
+  eext_object_event_callback_add(ewk_view_,
+                               EEXT_CALLBACK_BACK,
                                key_callback,
                                this);
-  ea_object_event_callback_add(ewk_view_,
-                               EA_CALLBACK_MORE,
+  eext_object_event_callback_add(ewk_view_,
+                               EEXT_CALLBACK_MORE,
                                key_callback,
                                this);
   smart_callbacks_["key_callback"] = key_callback;
@@ -747,9 +747,9 @@ void WebViewImpl::OnRotation(int degree) {
   ewk_view_orientation_send(ewk_view_, ToWebRotation(degree));
 }
 
-void WebViewImpl::OnKeyEvent(Ea_Callback_Type key_type) {
+void WebViewImpl::OnKeyEvent(Eext_Callback_Type key_type) {
   std::string keyname;
-  if (key_type == EA_CALLBACK_BACK) {
+  if (key_type == EEXT_CALLBACK_BACK) {
     if (fullscreen_) {
       ewk_view_fullscreen_exit(ewk_view_);
       return;
@@ -758,7 +758,7 @@ void WebViewImpl::OnKeyEvent(Ea_Callback_Type key_type) {
       return;
     }
     keyname = kKeyNameBack;
-  } else if (key_type == EA_CALLBACK_MORE) {
+  } else if (key_type == EEXT_CALLBACK_MORE) {
     keyname = kKeyNameMenu;
   } else {
     return;

diff --git a/src/runtime/web_view_impl.h b/src/runtime/web_view_impl.h
index 8b00082..0142593 100755 (executable)
--- a/src/runtime/web_view_impl.h
+++ b/src/runtime/web_view_impl.h
@@ -20,7 +20,7 @@
 
 
 #include <Elementary.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <string>
 #include <map>
 
@@ -54,7 +54,7 @@ class WebViewImpl {
   std::string mime() const { return mime_; }
 
  private:
-  void OnKeyEvent(Ea_Callback_Type key_type);
+  void OnKeyEvent(Eext_Callback_Type key_type);
   void OnRotation(int degree);
   void Initialize();
   void Deinitialize();

diff --git a/tests/popup/CMakeLists.txt b/tests/popup/CMakeLists.txt
index 4795008..bc8fd45 100755 (executable)
--- a/tests/popup/CMakeLists.txt
+++ b/tests/popup/CMakeLists.txt
@@ -30,7 +30,6 @@ PKG_CHECK_MODULES(TARGET_TEST_POPUP_DEPS
     ${WIN_PKG}
     elementary
     ecore
-    efl-assist
    REQUIRED)
 
 # Include Directories

diff --git a/tests/popup/popup.cc b/tests/popup/popup.cc
index 9bdc390..1bc257a 100755 (executable)
--- a/tests/popup/popup.cc
+++ b/tests/popup/popup.cc
@@ -17,8 +17,6 @@
 
 #include "popup/popup.h"
 
-#include <efl_assist.h>
-
 #include "runtime/native_window.h"
 #include "runtime/popup_string.h"
 #include "common/logger.h"