summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinho Kim <minho07.kim@samsung.com>2013-07-05 10:31:11 (GMT)
committerMinho Kim <minho07.kim@samsung.com>2013-07-05 10:31:11 (GMT)
commit3a16cc3858b355a2790c6e884a649e18fbe0ecdc (patch)
treea7e67a13fbf12ccf92fea93eab948bac8e7f57cf
parent8d0a39c6e73acc58d1d928bf9c08b8dadb89753a (diff)
parent7437dea0ef82c86b30a2a3d4cba3fc450ef99e4c (diff)
downloadstarter-3a16cc3858b355a2790c6e884a649e18fbe0ecdc.zip
starter-3a16cc3858b355a2790c6e884a649e18fbe0ecdc.tar.gz
starter-3a16cc3858b355a2790c6e884a649e18fbe0ecdc.tar.bz2
Merge branch 'master' into tizen_2.2
-rwxr-xr-xCMakeLists.txt8
-rw-r--r--packaging/starter.spec6
-rwxr-xr-xrd3starter26
-rwxr-xr-xrd4starter14
-rwxr-xr-xsrc/hw_key.c2
-rwxr-xr-xstarter14
-rwxr-xr-xstarter.manifest2
7 files changed, 2 insertions, 70 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ba6180..7d0cd55 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,14 +95,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/starter.rule DESTINATION /opt/etc/smack/access
#CONFIGURE_FILE(${PROJECT_NAME}.desktop.in ${PROJECT_NAME}.desktop)
#INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION share/applications)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/rd4starter DESTINATION /etc/init.d
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/rd3starter DESTINATION /etc/init.d
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-#INSTALL to /etc/init.d
-
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/starter.service DESTINATION /usr/lib/systemd/user)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/starter.socket DESTINATION /usr/lib/systemd/user)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/starter.path DESTINATION /usr/lib/systemd/user)
diff --git a/packaging/starter.spec b/packaging/starter.spec
index dc23fd9..d79bc9a 100644
--- a/packaging/starter.spec
+++ b/packaging/starter.spec
@@ -90,15 +90,9 @@ vconftool set -t int memory/idle-screen/is_idle_screen_launched "0" -i -u 5000 -
vconftool set -t int memory/idle-screen/top "0" -i -f
vconftool set -t int memory/idle-screen/safemode "0" -i -f
-ln -sf /etc/init.d/rd4starter /etc/rc.d/rc4.d/S81starter
-ln -sf /etc/init.d/rd3starter /etc/rc.d/rc3.d/S43starter
-
-
%files
%manifest starter.manifest
%defattr(-,root,root,-)
-%{_sysconfdir}/init.d/rd4starter
-%{_sysconfdir}/init.d/rd3starter
%{_bindir}/starter
/usr/ug/lib/libug-lockscreen-options.so
/usr/ug/lib/libug-lockscreen-options.so.0.1.0
diff --git a/rd3starter b/rd3starter
deleted file mode 100755
index 0304170..0000000
--- a/rd3starter
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# commented and this was moved to isf-panel-efl code
-#while [ ! -f /tmp/.wm_ready ];
-#do
-# sleep 0.1
-#done
-
-while [ ! -f /tmp/amd_ready ];
-do
- sleep 0.1
-done
-
-vconf_set_safemode()
-{
- if [ -f /opt/etc/.safemode ]
- then
- vconftool set -t int memory/idle-screen/safemode "1" -i -f
- else
- vconftool set -t int memory/idle-screen/safemode "0" -i -f
- fi
-}
-vconf_set_safemode
-
-echo -e "<2>[${_G}menu-daemon start${C_}]" > /dev/kmsg
-/usr/bin/starter &
diff --git a/rd4starter b/rd4starter
deleted file mode 100755
index e5a896c..0000000
--- a/rd4starter
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-vconf_set_safemode()
-{
- if [ -f /opt/etc/.safemode ]
- then
- vconftool set -t int memory/idle-screen/safemode "1" -i -f
- else
- vconftool set -t int memory/idle-screen/safemode "0" -i -f
- fi
-}
-vconf_set_safemode
-
-echo -e "<2>[${_G}menu-daemon start${C_}]" > /dev/kmsg
-/usr/bin/starter &
diff --git a/src/hw_key.c b/src/hw_key.c
index ee51cb2..f4f3223 100755
--- a/src/hw_key.c
+++ b/src/hw_key.c
@@ -231,6 +231,8 @@ static Eina_Bool _key_press_cb(void *data, int type, void *event)
key_info.long_press = NULL;
}
+ syspopup_destroy_all();
+
key_info.long_press = ecore_timer_add(0.5, _launch_taskmgr_cb, NULL);
if (!key_info.long_press)
_E("Failed to add timer for long press detection");
diff --git a/starter b/starter
deleted file mode 100755
index b5c0fa6..0000000
--- a/starter
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-CURRENT_RUNLEVEL=`basename $PWD`
-# CURRENT_RUNLEVEL could be "rc3.d" or "rc4.d"
-
-if [ x"$CURRENT_RUNLEVEL" == x"rc3.d" ]; then
- while [ ! -f /tmp/.wm_ready ];
- do
- sleep 0.1
- done
-fi
-
-/usr/bin/starter &
-
diff --git a/starter.manifest b/starter.manifest
index 62d872a..c12fb88 100755
--- a/starter.manifest
+++ b/starter.manifest
@@ -7,8 +7,6 @@
</request>
<assign>
<filesystem path="/usr/bin/starter" label="starter" exec_label="starter" />
- <filesystem path="/etc/init.d/rd3starter" label="_" exec_label="none" />
- <filesystem path="/etc/init.d/rd4starter" label="_" exec_label="none" />
<filesystem path="/usr/lib/systemd/user/starter.path" label="_" exec_label="none" />
<filesystem path="/usr/lib/systemd/user/starter.service" label="_" exec_label="none" />
<filesystem path="/usr/lib/systemd/user/starter.socket" label="_" exec_label="none" />