Replace the deprecated efl-assist with efl-extension

Change-Id: I1bdf0c5ab2001e1725961ebbeae432d671777848

diff --git a/configure.ac b/configure.ac
index fd2cc7b..60c7bbb 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,7 @@ if test "$ISF_HAS_EFL" = "yes"; then
 fi
 
 # Check EFL assist library
-PKG_CHECK_MODULES(EFL_ASSIST, [efl-assist])
+PKG_CHECK_MODULES(EFL_EXTENSION, [efl-extension])
 
 # Check tzplatform-config library
 PKG_CHECK_MODULES(TZPLATFORM_CONFIG, [libtzplatform-config])

diff --git a/ism/demos/Makefile.am b/ism/demos/Makefile.am
index 8d65c9c..c4572b6 100644 (file)
--- a/ism/demos/Makefile.am
+++ b/ism/demos/Makefile.am
@@ -49,7 +49,7 @@ isf_demo_efl_CXXFLAGS = @EFL_CFLAGS@ \
                         @UIGADGET_CFLAGS@ \
                         @VCONF_CFLAGS@ \
                         @PRIVILEGE_CONTROL_CFLAGS@ \
-                        @EFL_ASSIST_CFLAGS@ \
+                        @EFL_EXTENSION_CFLAGS@ \
                         @DLOG_CFLAGS@ \
                         -fPIE
 
@@ -59,7 +59,7 @@ isf_demo_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                         @APPCORE_EFL_LIBS@ \
                         @UIGADGET_LIBS@ \
                         @PRIVILEGE_CONTROL_LIBS@ \
-                        @EFL_ASSIST_LIBS@ \
+                        @EFL_EXTENSION_LIBS@ \
                         @DLOG_LIBS@ \
                         -pie
 

diff --git a/ism/demos/isf_demo_efl.cpp b/ism/demos/isf_demo_efl.cpp
index 498085e..0e5ef98 100644 (file)
--- a/ism/demos/isf_demo_efl.cpp
+++ b/ism/demos/isf_demo_efl.cpp
@@ -28,7 +28,7 @@
 #include <Ecore_X.h>
 #include <privilege-control.h>
 #include <vconf.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include "scim_private.h"
 #include "isf_demo_efl.h"
 #include "isf_imcontrol_efl.h"
@@ -267,7 +267,7 @@ static Evas_Object* _create_naviframe_layout (Evas_Object *parent)
 {
     Evas_Object *naviframe = elm_naviframe_add (parent);
     elm_naviframe_prev_btn_auto_pushed_set (naviframe, EINA_FALSE);
-    ea_object_event_callback_add (naviframe, EA_CALLBACK_BACK, _naviframe_back_cb, NULL);
+    eext_object_event_callback_add (naviframe, EEXT_CALLBACK_BACK, _naviframe_back_cb, NULL);
     elm_object_part_content_set (parent, "elm.swallow.content", naviframe);
 
     evas_object_show (naviframe);
@@ -398,8 +398,6 @@ static int app_resume (void *data)
 
 int main (int argc, char *argv[])
 {
-    perm_app_set_privilege ("isf", NULL, NULL);
-
     struct appdata ad;
     struct appcore_ops ops;
 
@@ -440,7 +438,8 @@ Evas_Object *create_ef (Evas_Object *parent, const char *label, const char *guid
     evas_object_show (lb);
     elm_box_pack_end (bx, lb);
 
-    en = ea_editfield_add (parent, EA_EDITFIELD_SCROLL_SINGLELINE);
+    en = elm_entry_add (parent);
+    elm_entry_single_line_set (en, EINA_TRUE);
     evas_object_size_hint_weight_set (en, EVAS_HINT_EXPAND, 0.0);
     evas_object_size_hint_align_set (en, EVAS_HINT_FILL, 0.0);
     elm_object_part_text_set (en, "elm.guide", guide_text);

diff --git a/ism/extras/efl_panel/Makefile.am b/ism/extras/efl_panel/Makefile.am
index d8e7eaa..017351d 100644 (file)
--- a/ism/extras/efl_panel/Makefile.am
+++ b/ism/extras/efl_panel/Makefile.am
@@ -35,7 +35,7 @@ isf_panel_efl_SOURCES  += minicontrol.cpp
 endif
 
 isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ \
-                         @EFL_ASSIST_CFLAGS@ \
+                         @EFL_EXTENSION_CFLAGS@ \
                          @VCONF_CFLAGS@ \
                          @X11_CFLAGS@ \
                          @PRIVILEGE_CONTROL_CFLAGS@ \
@@ -53,7 +53,7 @@ isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ \
 
 isf_panel_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                          @ECOREX_LIBS@ \
-                         @EFL_ASSIST_LIBS@ \
+                         @EFL_EXTENSION_LIBS@ \
                          @VCONF_LIBS@ \
                          @X11_LIBS@ \
                          @PRIVILEGE_CONTROL_LIBS@ \

diff --git a/ism/extras/efl_panel/iseselector.cpp b/ism/extras/efl_panel/iseselector.cpp
index 49b84dc..0438eba 100644 (file)
--- a/ism/extras/efl_panel/iseselector.cpp
+++ b/ism/extras/efl_panel/iseselector.cpp
@@ -26,7 +26,7 @@
 
 #include <Elementary.h>
 #include <Ecore_X.h>
-#include <efl_assist.h>
+#include <efl_extension.h>
 #include <dlog.h>
 #include "scim_private.h"
 #include "scim.h"
@@ -213,7 +213,7 @@ void ise_selector_create (unsigned ise_idx, Ecore_X_Window win, Ise_Selector_Sel
         return;
 
     evas_object_event_callback_add (_ise_selector_popup, EVAS_CALLBACK_DEL, ise_selector_popup_del_cb, NULL);
-    ea_object_event_callback_add (_ise_selector_popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);
+    eext_object_event_callback_add (_ise_selector_popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL);
     evas_object_smart_callback_add (_ise_selector_popup, "block,clicked", ise_selector_block_clicked_cb, NULL);
     elm_object_domain_translatable_part_text_set (_ise_selector_popup, "title,text", GETTEXT_PACKAGE, "Select input method");
 

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index 7059528..852f701 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -64,7 +64,6 @@
 #if HAVE_NOTIFICATION
 #include <notification.h>
 #endif
-#include <efl_assist.h>
 #if HAVE_TTS
 #include <tts.h>
 #endif

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 452e76c..f3594f3 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -32,7 +32,7 @@ BuildRequires:  pkgconfig(tts)
 BuildRequires:  pkgconfig(security-server)
 BuildRequires:  pkgconfig(edbus)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
-BuildRequires:  efl-assist-devel
+BuildRequires:  efl-extension-devel
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  capi-appfw-package-manager-devel