From b0ae05bc9d957671f1c50fb8feeb738de743228d Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 4 Aug 2023 15:58:40 +0900 Subject: [PATCH] Remove ODE dependency due to ODE deprecate Change-Id: I4f914c5a16de8236d98b3f1fd56da7eebfe93070 Signed-off-by: Jihoon Kim --- CMakeLists.txt | 1 - packaging/ise-default.spec | 1 - src/ise.cpp | 18 +----------------- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3840f6..3b3540c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,6 @@ SET(PKGS_CHECK_MODULES capi-system-system-settings smartreply key-manager - ode glib-2.0 dbus-1 gio-2.0 diff --git a/packaging/ise-default.spec b/packaging/ise-default.spec index be74be5..45f0df1 100644 --- a/packaging/ise-default.spec +++ b/packaging/ise-default.spec @@ -24,7 +24,6 @@ BuildRequires: pkgconfig(capi-media-sound-manager) BuildRequires: pkgconfig(capi-ui-inputmethod) BuildRequires: pkgconfig(smartreply) BuildRequires: pkgconfig(key-manager) -BuildRequires: pkgconfig(ode) BuildRequires: pkgconfig(capi-system-system-settings) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(dbus-1) diff --git a/src/ise.cpp b/src/ise.cpp index e8eb514..9e0f404 100644 --- a/src/ise.cpp +++ b/src/ise.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "autofill.h" #include "ise.h" @@ -1944,11 +1943,6 @@ static void register_preference_changed_callback(void) LOGW("Failed to set ise_floating_mode_changed_cb()"); } -static void ise_mount_changed_cb(void *user_data) -{ - register_preference_changed_callback(); -} - void ise_create() { @@ -2042,17 +2036,7 @@ ise_create() if (!exist) write_ise_config_values(); - int state; - if (ode_internal_encryption_get_state(&state) == ODE_ERROR_NONE) { - if (state == ODE_STATE_ENCRYPTED) { - if (ode_internal_encryption_set_mount_event_cb(ise_mount_changed_cb, NULL) != ODE_ERROR_NONE) - LOGW("Failed to set mount_event_cb()"); - } else if (state == ODE_STATE_UNENCRYPTED) { - register_preference_changed_callback(); - } - } else { - LOGW("Failed to get encryption_state"); - } + register_preference_changed_callback(); } init_recent_used_punctuation(); } -- 2.7.4