Rename isf-panel-efl to isf

Change-Id: I82d1efb8ebccb0c617fa1fd89126420bcdeff186
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/ism/configs/global b/ism/configs/global
index 054f599..5f146b8 100755 (executable)
--- a/ism/configs/global
+++ b/ism/configs/global
@@ -1,5 +1,5 @@
 /SupportedUnicodeLocales = en_US.UTF-8
-/DefaultPanelProgram = isf-panel-efl
+/DefaultPanelProgram = isf
 /DefaultConfigModule = simple
 /DefaultSocketFrontEndAddress = local:/run/.isf/scim-socket-frontend
 /DefaultSocketIMEngineAddress = local:/run/.isf/scim-socket-frontend
@@ -21,4 +21,4 @@
 /LockScreenClassName = LOCK_SCREEN, hub-idlescreen
 /LaunchRemoteInput = true
 /LaunchWebServer = true
-/EnableAutoRestartIse = true
\ No newline at end of file
+/EnableAutoRestartIse = true

diff --git a/ism/extras/efl_panel/Makefile.am b/ism/extras/efl_panel/Makefile.am
index f103004..368badb 100644 (file)
--- a/ism/extras/efl_panel/Makefile.am
+++ b/ism/extras/efl_panel/Makefile.am
@@ -23,59 +23,59 @@ noinst_HEADERS = isf_panel_utility.h \
                  websocketserver.h
 
 if ISF_BUILD_PANEL_EFL
-CONFIG_SCIM_PANEL_EFL  = isf-panel-efl
+CONFIG_SCIM_PANEL_EFL  = isf
 endif
 
 bin_PROGRAMS           = $(CONFIG_SCIM_PANEL_EFL)
 
-isf_panel_efl_SOURCES  = isf_panel_efl.cpp \
-                         isf_panel_utility.cpp \
-                         ../../src/tizen_profile.cpp
+isf_SOURCES  = isf_panel_efl.cpp \
+               isf_panel_utility.cpp \
+               ../../src/tizen_profile.cpp
 
 if ISF_BUILD_REMOTE_INPUT
-isf_panel_efl_SOURCES  += remote_input.cpp
+isf_SOURCES  += remote_input.cpp
 if ISF_BUILD_OPEN_INPUT
-isf_panel_efl_SOURCES  += websocketserver.cpp
+isf_SOURCES  += websocketserver.cpp
 endif
 endif
 
-isf_panel_efl_CXXFLAGS = @ECORE_WL_CFLAGS@ \
-                         @ECORE_CFLAGS@ \
-                         @ECORE_IMF_CFLAGS@ \
-                         @EINA_CFLAGS@ \
-                         @VCONF_CFLAGS@ \
-                         @X_CFLAGS@ \
-                         @DLOG_CFLAGS@ \
-                         @NOTIFICATION_CFLAGS@ \
-                         @LIBWEBSOCKETS_CFLAGS@ \
-                         @XKBCOMMON_CFLAGS@ \
-                         @APP_CONTROL_CFLAGS@ \
-                         @PKGMGR_INFO_CFLAGS@ \
-                         @PACKAGE_MANAGER_CFLAGS@ \
-                         @AUL_CFLAGS@ \
-                         @SYSTEM_INFO_CFLAGS@ \
-                         @SYSTEM_RESOURCE_CFLAGS@ \
-                         -fPIE
+isf_CXXFLAGS = @ECORE_WL_CFLAGS@ \
+               @ECORE_CFLAGS@ \
+               @ECORE_IMF_CFLAGS@ \
+               @EINA_CFLAGS@ \
+               @VCONF_CFLAGS@ \
+               @X_CFLAGS@ \
+               @DLOG_CFLAGS@ \
+               @NOTIFICATION_CFLAGS@ \
+               @LIBWEBSOCKETS_CFLAGS@ \
+               @XKBCOMMON_CFLAGS@ \
+               @APP_CONTROL_CFLAGS@ \
+               @PKGMGR_INFO_CFLAGS@ \
+               @PACKAGE_MANAGER_CFLAGS@ \
+               @AUL_CFLAGS@ \
+               @SYSTEM_INFO_CFLAGS@ \
+               @SYSTEM_RESOURCE_CFLAGS@ \
+               -fPIE
 
-isf_panel_efl_LDFLAGS  = @LTLIBINTL@ -rpath $(libdir) \
-                         @ECORE_WL_LIBS@ \
-                         @ECORE_LIBS@ \
-                         @ECORE_IMF_LIBS@ \
-                         @EINA_LIBS@ \
-                         @VCONF_LIBS@ \
-                         @X_LIBS@ \
-                         @DLOG_LIBS@ \
-                         @NOTIFICATION_LIBS@ \
-                         @LIBWEBSOCKETS_LIBS@ \
-                         @XKBCOMMON_LIBS@ \
-                         @APP_CONTROL_LIBS@ \
-                         @PKGMGR_INFO_LIBS@ \
-                         @PACKAGE_MANAGER_LIBS@ \
-                         @AUL_LIBS@ \
-                         @SYSTEM_INFO_LIBS@ \
-                         @SYSTEM_RESOURCE_LIBS@ \
-                         -pie
+isf_LDFLAGS  = @LTLIBINTL@ -rpath $(libdir) \
+               @ECORE_WL_LIBS@ \
+               @ECORE_LIBS@ \
+               @ECORE_IMF_LIBS@ \
+               @EINA_LIBS@ \
+               @VCONF_LIBS@ \
+               @X_LIBS@ \
+               @DLOG_LIBS@ \
+               @NOTIFICATION_LIBS@ \
+               @LIBWEBSOCKETS_LIBS@ \
+               @XKBCOMMON_LIBS@ \
+               @APP_CONTROL_LIBS@ \
+               @PKGMGR_INFO_LIBS@ \
+               @PACKAGE_MANAGER_LIBS@ \
+               @AUL_LIBS@ \
+               @SYSTEM_INFO_LIBS@ \
+               @SYSTEM_RESOURCE_LIBS@ \
+               -pie
 
-isf_panel_efl_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la \
-                         $(top_builddir)/ism/src/libisf_pkg.la \
-                         $(top_builddir)/ism/src/libprivilege_checker.la
+isf_LDADD    = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la \
+               $(top_builddir)/ism/src/libisf_pkg.la \
+               $(top_builddir)/ism/src/libprivilege_checker.la

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index a82aa8d..8eb3de1 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -567,7 +567,7 @@ static void delete_notification (NotificationData *noti_data)
     if (!_MOBILE && !_COMMON) return;
 
     if (noti_data->noti_id != 0) {
-        notification_delete_by_priv_id ("isf-panel-efl", NOTIFICATION_TYPE_ONGOING, noti_data->noti_id);
+        notification_delete_by_priv_id ("isf", NOTIFICATION_TYPE_ONGOING, noti_data->noti_id);
         LOGD ("deleted notification : %s", noti_data->launch_app.c_str ());
         noti_data->noti_id = 0;
     }
@@ -583,13 +583,13 @@ static void create_notification (NotificationData *noti_data)
     if (!_MOBILE && !_COMMON) return;
 
     if (noti_data->noti_id != 0) {
-        notification_delete_by_priv_id ("isf-panel-efl", NOTIFICATION_TYPE_ONGOING, noti_data->noti_id);
+        notification_delete_by_priv_id ("isf", NOTIFICATION_TYPE_ONGOING, noti_data->noti_id);
         noti_data->noti_id = 0;
     }
 
     notification = notification_create (NOTIFICATION_TYPE_ONGOING);
     if (notification != NULL) {
-        notification_set_pkgname (notification, "isf-panel-efl");
+        notification_set_pkgname (notification, "isf");
         notification_set_layout (notification, NOTIFICATION_LY_ONGOING_EVENT);
         notification_set_image (notification, NOTIFICATION_IMAGE_TYPE_ICON, noti_data->icon.c_str());
         notification_set_text (notification, NOTIFICATION_TEXT_TYPE_TITLE, _(noti_data->title.c_str()), NULL, NOTIFICATION_VARIABLE_TYPE_NONE);
@@ -1926,7 +1926,7 @@ static bool set_active_ise (const String &uuid, bool launch_ise)
         LOGE ("pkgmgrinfo_appinfo_filter_create failed(%d)", ret);
     }
 
-    /* If the ime_num and _ime_info.size() are different, it is likely that the isf-panel-efl was
+    /* If the ime_num and _ime_info.size() are different, it is likely that the isf was
        terminated abnormally while processing package manager's install / uninstall events */
     LOGD("Checking whether db file needs to be re-created : %d %zu", ime_num, _ime_info.size());
     if (ime_num != (int)_ime_info.size()) {
@@ -7391,8 +7391,8 @@ int main (int argc, char *argv [])
     Ecore_Event_Handler *xwindow_focus_out_handler = NULL;
 #endif
 
-    check_time ("\nStarting ISF Panel EFL...... ");
-    ISF_SAVE_LOG ("Starting ISF Panel EFL......");
+    check_time ("\nStarting ISF ...... ");
+    ISF_SAVE_LOG ("Starting ISF ......");
 
     DebugOutput::disable_debug (SCIM_DEBUG_AllMask);
     DebugOutput::enable_debug (SCIM_DEBUG_MainMask);
@@ -7514,7 +7514,7 @@ int main (int argc, char *argv [])
     check_time (buf);
 
     if (daemon) {
-        check_time ("ISF Panel EFL run as daemon");
+        check_time ("ISF run as daemon");
         scim_daemon ();
     }
 

diff --git a/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp b/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp
index b8cb007..9e78e02 100644 (file)
--- a/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp
+++ b/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp
@@ -192,7 +192,7 @@ private:
         LOGD ("");
         /**
          * socket config server can not send message actively
-         * isf-panel-efl also has this process like
+         * isf also has this process like
          * _config->signal_connect_reload(slot(callbackfunction))
          * in callback function, it will invokes
          * ecore_socket_panelagent->reload_config() in final

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 4ffaf9d..5b8a762 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -139,6 +139,8 @@ install -m 0644 %SOURCE300 %{buildroot}%{_datadir}/dbus-1/system-services/org.ti
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 install -m 0644 %SOURCE400 %{buildroot}%{_sysconfdir}/dbus-1/system.d/engine-loader.conf
 
+ln -sf %{_bindir}/isf %{buildroot}%{_bindir}/isf-panel-efl
+
 %find_lang scim
 
 cat scim.lang > isf.lang
@@ -158,6 +160,7 @@ cat scim.lang > isf.lang
 %{_sysconfdir}/scim/config
 %{_datadir}/scim/icons/*
 %{_bindir}/isf-demo-efl
+%{_bindir}/isf
 %{_bindir}/isf-panel-efl
 %{_libdir}/ecore_imf/modules/*/*/*.so
 %{_libdir}/scim-1.0/1.4.0/IMEngine/socket.so