From 13d1350cf0adc662bf9dfc4ac90ea6cebbcd1e1b Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Sun, 20 Sep 2020 10:16:58 +0900 Subject: [PATCH] Remove profile library dependencies Change-Id: Ib069b33a81cce895fe7d8e10c77f699d0f1ac7df Signed-off-by: Jihoon Kim --- ism/extras/kbd_mode_changer/Makefile.am | 2 -- ism/extras/kbd_mode_changer/include/main.h | 1 - ism/extras/kbd_mode_changer/main.cpp | 5 ++--- ism/src/Makefile.am | 2 +- ism/src/scim_socket.cpp | 7 +++---- ism/src/scim_utility.cpp | 1 - ism/src/tizen_profile.cpp | 25 ------------------------- ism/src/tizen_profile.h | 2 -- 8 files changed, 6 insertions(+), 39 deletions(-) diff --git a/ism/extras/kbd_mode_changer/Makefile.am b/ism/extras/kbd_mode_changer/Makefile.am index c76512d..2145985 100644 --- a/ism/extras/kbd_mode_changer/Makefile.am +++ b/ism/extras/kbd_mode_changer/Makefile.am @@ -37,5 +37,3 @@ isf_kbd_mode_changer_LDFLAGS = @VCONF_LIBS@ -rpath $(libdir)\ @DLOG_LIBS@ \ @SERVICE_APPLICATION_LIBS@ \ -pie - -isf_kbd_mode_changer_LDADD = $(top_builddir)/ism/src/libprofile.la diff --git a/ism/extras/kbd_mode_changer/include/main.h b/ism/extras/kbd_mode_changer/include/main.h index 73c7c4f..80cc7f5 100644 --- a/ism/extras/kbd_mode_changer/include/main.h +++ b/ism/extras/kbd_mode_changer/include/main.h @@ -27,7 +27,6 @@ #include #include -#include "isf_debug.h" #if !defined(PACKAGE) # define PACKAGE "isf-kbd-mode-changer" diff --git a/ism/extras/kbd_mode_changer/main.cpp b/ism/extras/kbd_mode_changer/main.cpp index 2885288..f4342fe 100644 --- a/ism/extras/kbd_mode_changer/main.cpp +++ b/ism/extras/kbd_mode_changer/main.cpp @@ -22,8 +22,7 @@ * */ -#include "scim_private.h" -#include "scim_visibility.h" +#include #ifdef HAVE_VCONF #include #endif @@ -61,7 +60,7 @@ static void app_terminate (void *user_data) LOGD ("app terminated"); } -EXAPI int main (int argc, char *argv []) +EXPORT_API int main (int argc, char *argv []) { service_app_lifecycle_callback_s event_callback = {0, }; diff --git a/ism/src/Makefile.am b/ism/src/Makefile.am index 40677a6..92422d1 100644 --- a/ism/src/Makefile.am +++ b/ism/src/Makefile.am @@ -174,7 +174,7 @@ libscim_imengine_la_LDFLAGS = -version-info $(SCIM_CURRENT):$(SCIM_REVISION):$( @SYSTEMD_LIBS@ \ -lstdc++ -libscim_imengine_la_LIBADD = libltdlc.la libprofile.la +libscim_imengine_la_LIBADD = libltdlc.la libscim@SCIM_EPOCH@_la_SOURCES = \ scim_backend.cpp \ diff --git a/ism/src/scim_socket.cpp b/ism/src/scim_socket.cpp index 8b12e2d..b580879 100644 --- a/ism/src/scim_socket.cpp +++ b/ism/src/scim_socket.cpp @@ -56,7 +56,6 @@ #include #include #include -#include "isf_debug.h" #include "scim_private.h" #include "scim.h" @@ -550,7 +549,7 @@ public: char proc_name[17] = {0}; /* the buffer provided shall at least be 16+1 bytes long */ if (-1 != prctl (PR_GET_NAME, proc_name, 0, 0, 0)) { - LOGD ("ppid:%d trying connect() to %s, %s", getppid (), addr.get_address ().c_str (), proc_name); + LOGI ("ppid:%d trying connect() to %s, %s", getppid (), addr.get_address ().c_str (), proc_name); } if ((m_err = ::connect (m_id, data, len)) == 0) { @@ -559,7 +558,7 @@ public: } m_address = addr; - LOGD ("connect() succeeded"); + LOGI ("connect() succeeded"); return true; } @@ -584,7 +583,7 @@ public: LOGW ("timeout in select()"); } else { // We've got something, connection succeeded - LOGD ("finally connected"); + LOGI ("finally connected"); if (fcntl (m_id, F_SETFL, flags) == -1) { m_err = errno; diff --git a/ism/src/scim_utility.cpp b/ism/src/scim_utility.cpp index 52720a2..8c0a04b 100644 --- a/ism/src/scim_utility.cpp +++ b/ism/src/scim_utility.cpp @@ -49,7 +49,6 @@ #include #include #include -#include "isf_debug.h" #include "scim_private.h" #include "scim.h" diff --git a/ism/src/tizen_profile.cpp b/ism/src/tizen_profile.cpp index 59d00d8..6a0d2da 100644 --- a/ism/src/tizen_profile.cpp +++ b/ism/src/tizen_profile.cpp @@ -63,28 +63,3 @@ tizen_profile_t _get_tizen_profile() return g_profile; } - -void isf_set_tizen_profile(const char *profileName) -{ - switch (*profileName) - { - case 'm': - case 'M': - g_profile = TIZEN_PROFILE_MOBILE; - break; - case 'w': - case 'W': - g_profile = TIZEN_PROFILE_WEARABLE; - break; - case 't': - case 'T': - g_profile = TIZEN_PROFILE_TV; - break; - case 'i': - case 'I': - g_profile = TIZEN_PROFILE_IVI; - break; - default: // common or unknown ==> ALL ARE COMMON. - g_profile = TIZEN_PROFILE_COMMON; - } -} \ No newline at end of file diff --git a/ism/src/tizen_profile.h b/ism/src/tizen_profile.h index 4294d8d..84ed6e1 100644 --- a/ism/src/tizen_profile.h +++ b/ism/src/tizen_profile.h @@ -38,8 +38,6 @@ typedef enum { extern "C" { #endif /* __cplusplus */ -void isf_set_tizen_profile(const char *profile_name); - extern tizen_profile_t _get_tizen_profile(); #define _TV (_get_tizen_profile() == TIZEN_PROFILE_TV) -- 2.7.4