From ee8fe15417cbb48076f2cb6eb230b02ac6e1a77b Mon Sep 17 00:00:00 2001 From: Wonkeun Oh Date: Wed, 17 Jun 2015 11:38:04 +0900 Subject: [PATCH] Added udev rule file for uinput permission error and removed unused code Change-Id: I5774b19567afa7319d96d1eb8580ac12baef1dc9 --- 99-input.rules | 1 + Makefile.am | 3 +++ ism/extras/efl_panel/websocketserver.cpp | 15 --------------- packaging/isf.spec | 1 + 4 files changed, 5 insertions(+), 15 deletions(-) create mode 100644 99-input.rules diff --git a/99-input.rules b/99-input.rules new file mode 100644 index 0000000..2098328 --- /dev/null +++ b/99-input.rules @@ -0,0 +1 @@ +KERNEL=="uinput", GROUP="uinput", MODE:="0666" diff --git a/Makefile.am b/Makefile.am index fab38c0..88bce5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,9 @@ pkgconfig_DATA = isf.pc scim.pc \ kbdmodechangerxmldir = @RO_PACKAGES_DIR@ kbdmodechangerxml_DATA = org.tizen.isf-kbd-mode-changer.xml +udevdir = /etc/udev/rules.d/ +udev_DATA = 99-input.rules + ACLOCAL_AMFLAGS = -I ism/m4 .PHONY: update-ChangeLog diff --git a/ism/extras/efl_panel/websocketserver.cpp b/ism/extras/efl_panel/websocketserver.cpp index 8fac28d..c5f3b73 100644 --- a/ism/extras/efl_panel/websocketserver.cpp +++ b/ism/extras/efl_panel/websocketserver.cpp @@ -34,22 +34,7 @@ #include "websocketserver.h" #include "remote_input.h" -#ifdef WIN32 - -#ifdef EXTERNAL_POLL - #ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN - #endif - #include - #include - #include - - #include "websock-w32.h" -#endif - -#else // NOT WIN32 #include -#endif #include diff --git a/packaging/isf.spec b/packaging/isf.spec index 751f49b..49fe333 100644 --- a/packaging/isf.spec +++ b/packaging/isf.spec @@ -137,6 +137,7 @@ ln -sf %{_libdir}/ecore_imf/modules/wayland/v-1.16/module.so %{_libdir}/ecore_im %files -f isf.lang %manifest %{name}.manifest +/etc/udev/rules.d/99-input.rules %defattr(-,root,root,-) %dir /etc/scim/conf %attr(755,root,root) %{_sysconfdir}/profile.d/isf.sh -- 2.7.4