Remove source codes related with hibernation

Change-Id: I44cdf238ae10f6e6e53de10716bdbabda9277d72

diff --git a/configure.ac b/configure.ac
index b8fd46f..5b9a292 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -242,9 +242,6 @@ PKG_CHECK_MODULES(UTILX, [utilX])
 # Check appcore-efl library
 PKG_CHECK_MODULES(APPCORE_EFL, [appcore-efl])
 
-# Check HEYNOTI library
-PKG_CHECK_MODULES(HEYNOTI, [heynoti])
-
 # Check dlog library
 PKG_CHECK_MODULES(DLOG, [dlog >= 0])
 

diff --git a/debian/control b/debian/control
index 1595376..4cae57e 100755 (executable)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: standard
 Maintainer: Sehwan Park <sehwan@samsung.com>, Haifeng Deng <haifeng.deng@samsung.com>, Hengliang Luo <hl.luo@samsung.com>, Shuo Liu <shuo0805.liu@samsung.com>, Jihoon Kim <jihoon48.kim@samsung.com>, Yanjie Hu <yanjie.hu@samsung.com>
 Uploaders: Ji-hoon Lee <dalton.lee@samsung.com>
 Build-Depends: debhelper (>= 5), autotools-dev, pkg-config, libelm-dev, libglib2.0-dev,
- libappcore-efl-dev, libslp-utilx-dev, libslp-setting-dev, libui-gadget-dev, libheynoti-dev,
+ libappcore-efl-dev, libslp-utilx-dev, libslp-setting-dev, libui-gadget-dev,
  libecore-dev, libevas-dev, libx11-dev, dlog-dev, libprivilege-control-dev
 Standards-Version: 3.7.2
 Homepage: http://www.scim-im.org

diff --git a/ism/extras/efl_panel/Makefile.am b/ism/extras/efl_panel/Makefile.am
index 1e52241..89fbb51 100644 (file)
--- a/ism/extras/efl_panel/Makefile.am
+++ b/ism/extras/efl_panel/Makefile.am
@@ -28,11 +28,10 @@ bin_PROGRAMS           = $(CONFIG_SCIM_PANEL_EFL)
 isf_panel_efl_SOURCES  = isf_panel_efl.cpp \
                          isf_panel_utility.cpp
 
-isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ @VCONF_CFLAGS@ @HEYNOTI_CFLAGS@ @PRIVILEGE_CONTROL_CFLAGS@
+isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ @VCONF_CFLAGS@ @PRIVILEGE_CONTROL_CFLAGS@
 
 isf_panel_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                          @VCONF_LIBS@ \
-                         @HEYNOTI_LIBS@ \
                          @X11_LIBS@ \
                          @PRIVILEGE_CONTROL_LIBS@
 

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index a6ddc48..b5a36b6 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -50,7 +50,6 @@
 #include "scim.h"
 #include "scim_stl_map.h"
 #if HAVE_VCONF
-#include <heynoti.h>
 #include <vconf.h>
 #include <vconf-keys.h>
 #endif
@@ -2881,55 +2880,6 @@ static void display_language_changed_cb (keynode_t *key, void* data)
     String name = get_ise_name (_panel_agent->get_current_helper_uuid ());
     _panel_agent->set_current_ise_name (name);
 }
-
-/**
- * @brief Callback function for hibernation enter.
- *
- * @param data Data to pass when it is called.
- *
- * @return void
- */
-static void hibernation_enter_cb (void *data)
-{
-    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-
-    /* Remove callback function for input language and display language */
-    vconf_ignore_key_changed (VCONFKEY_LANGSET, display_language_changed_cb);
-}
-
-/**
- * @brief Callback function for hibernation leave.
- *
- * @param data Data to pass when it is called.
- *
- * @return void
- */
-static void hibernation_leave_cb (void *data)
-{
-    SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
-
-    if (data == NULL) {
-        if (!_config.null ())
-            _config->reload ();
-    }
-    /* Add callback function for input language and display language */
-    vconf_notify_key_changed (VCONFKEY_LANGSET, display_language_changed_cb, NULL);
-
-    scim_global_config_update ();
-    set_language_and_locale ();
-
-    try {
-        /* update ise list */
-        std::vector<String> list;
-        slot_get_ise_list (list);
-
-        /* Start default ISE */
-        slot_start_default_ise ();
-        change_hw_and_sw_keyboard ();
-    } catch (scim::Exception & e) {
-        std::cerr << e.what () << "\n";
-    }
-}
 #endif
 
 /**
@@ -3041,7 +2991,7 @@ int main (int argc, char *argv [])
     struct tms    tiks_buf;
     _clock_start = times (&tiks_buf);
 
-    int           i, ret1, hib_fd, fd;
+    int           i, fd;
 #ifdef WAIT_WM
     int           try_count       = 0;
 #endif
@@ -3206,14 +3156,6 @@ int main (int argc, char *argv [])
     elm_init (argc, argv);
     check_time ("elm_init");
 
-#if HAVE_VCONF
-    hib_fd = heynoti_init ();
-
-    /* register hibernation callback */
-    heynoti_subscribe (hib_fd, "HIBERNATION_ENTER", hibernation_enter_cb, NULL);
-    heynoti_subscribe (hib_fd, "HIBERNATION_LEAVE", hibernation_leave_cb, NULL);
-#endif
-
     /* Get current display. */
     {
         const char *p = getenv ("DISPLAY");
@@ -3301,13 +3243,22 @@ int main (int argc, char *argv [])
     check_time ("run_panel_agent");
 
 #if HAVE_VCONF
-    ret1 = heynoti_attach_handler (hib_fd);
-    if (ret1 == -1)
-        std::cerr << "heynoti_attach_handler () is failed!!!\n";
+    /* Add callback function for input language and display language */
+    vconf_notify_key_changed (VCONFKEY_LANGSET, display_language_changed_cb, NULL);
 
-    if (!ecore_file_exists ("/opt/etc/.hib_capturing")) {
-        /* in case of normal booting */
-        hibernation_leave_cb ((void *)1);
+    scim_global_config_update ();
+    set_language_and_locale ();
+
+    try {
+        /* update ise list */
+        std::vector<String> list;
+        slot_get_ise_list (list);
+
+        /* Start default ISE */
+        slot_start_default_ise ();
+        change_hw_and_sw_keyboard ();
+    } catch (scim::Exception & e) {
+        std::cerr << e.what () << "\n";
     }
 #endif
 
@@ -3345,8 +3296,8 @@ int main (int argc, char *argv [])
     if (helper_manager_handler)
         ecore_main_fd_handler_del (helper_manager_handler);
 #if HAVE_VCONF
-    hibernation_enter_cb (NULL);
-    heynoti_close (hib_fd);
+    /* Remove callback function for input language and display language */
+    vconf_ignore_key_changed (VCONFKEY_LANGSET, display_language_changed_cb);
 #endif
 
 cleanup:

diff --git a/ism/src/scim_module.cpp b/ism/src/scim_module.cpp
index d952062..72c79c8 100644 (file)
--- a/ism/src/scim_module.cpp
+++ b/ism/src/scim_module.cpp
@@ -68,9 +68,7 @@ _scim_get_module_paths (std::vector <String> &paths, const String &type)
     module_path_env = getenv ("SCIM_MODULE_PATH");
 
     if (module_path_env) {
-        struct stat buf;
-        if (stat ("/opt/etc/.hib_capturing", &buf) != 0)
-            module_paths.push_back (String (module_path_env));
+        module_paths.push_back (String (module_path_env));
     }
 
     // append version to the end of the paths

diff --git a/packaging/isf.spec b/packaging/isf.spec
index e743159..cd235e6 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -19,7 +19,6 @@ BuildRequires:  pkgconfig(elementary)
 BuildRequires:  pkgconfig(utilX)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(ui-gadget-1)
-BuildRequires:  pkgconfig(heynoti)
 BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(x11)