summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinkun Jang <jinkun.jang@samsung.com>2013-03-15 16:04:54 (GMT)
committerJinkun Jang <jinkun.jang@samsung.com>2013-03-15 16:04:54 (GMT)
commit1c67bdca0c2f2c8d0f80e0940579c6ad394d009b (patch)
tree0d916078976e12fbf710fd3fa09f16632e437d07
parent62d214f6031c50109217a6162e09be3bcc1656cf (diff)
downloadstarter-1c67bdca0c2f2c8d0f80e0940579c6ad394d009b.zip
starter-1c67bdca0c2f2c8d0f80e0940579c6ad394d009b.tar.gz
starter-1c67bdca0c2f2c8d0f80e0940579c6ad394d009b.tar.bz2
merge with master
-rwxr-xr-xCMakeLists.txt1
-rwxr-xr-xdebian/changelog9
-rwxr-xr-xlock-setting/lockscreen-options/src/lockscreen-options-main.c2
-rwxr-xr-xpackaging/starter.spec6
-rwxr-xr-xsrc/pkg_event.c6
-rwxr-xr-xsrc/starter.c26
-rwxr-xr-xstarter.manifest3
7 files changed, 44 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d03f51b..fec3928 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,7 @@ pkg_check_modules(pkgs REQUIRED
ui-gadget-1
bundle
capi-appfw-application
+ capi-system-info
)
FOREACH(flag ${pkgs_CFLAGS})
diff --git a/debian/changelog b/debian/changelog
index 05bf12b..2e11184 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+starter (0.4.58) unstable; urgency=low
+
+ * Git: slp/pkgs/s/starter
+ * Tag: starter_0.4.58
+
+ * Remove an unused vconf setting
+
+ -- Jin Yoon <jinny.yoon@samsung.com> Mon, 11 Mar 2013 16:23:50 +0900
+
starter (0.4.56) unstable; urgency=low
* Git: slp/pkgs/s/starter
diff --git a/lock-setting/lockscreen-options/src/lockscreen-options-main.c b/lock-setting/lockscreen-options/src/lockscreen-options-main.c
index 45ac930..bb8aa6f 100755
--- a/lock-setting/lockscreen-options/src/lockscreen-options-main.c
+++ b/lock-setting/lockscreen-options/src/lockscreen-options-main.c
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+
+
#include <vconf.h>
#include <vconf-keys.h>
#include <ui-gadget.h>
diff --git a/packaging/starter.spec b/packaging/starter.spec
index b33cc21..0c97228 100755
--- a/packaging/starter.spec
+++ b/packaging/starter.spec
@@ -1,7 +1,7 @@
Name: starter
Summary: starter
-Version: 0.4.56
-Release: 1
+Version: 0.4.58
+Release: 2
Group: TO_BE/FILLED_IN
License: TO_BE/FILLED_IN
Source0: starter-%{version}.tar.gz
@@ -33,6 +33,7 @@ BuildRequires: pkgconfig(vconf)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcomposite)
BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(capi-system-info)
BuildRequires: cmake
BuildRequires: edje-bin
BuildRequires: gettext-tools
@@ -84,7 +85,6 @@ vconftool set -t bool db/lockscreen/event_notification_display 1 $GOPTION
vconftool set -t bool db/lockscreen/clock_display 1 $GOPTION
vconftool set -t bool db/lockscreen/help_text_display 0 $GOPTION
-vconftool set -t string memory/menuscreen/desktop "0" -i -f
vconftool set -t int memory/idle-screen/is_idle_screen_launched "0" -i -u 5000 -f
vconftool set -t int memory/idle-screen/top "0" -i -f
vconftool set -t int memory/idle-screen/safemode "0" -i -f
diff --git a/src/pkg_event.c b/src/pkg_event.c
index f03b9ef..f3df8c5 100755
--- a/src/pkg_event.c
+++ b/src/pkg_event.c
@@ -286,11 +286,7 @@ void pkg_event_fini(void)
for (i = 0; i < CONF_PATH_NUMBER; i ++) {
if (paths[i].wd) {
if (inotify_rm_watch(s_desktop_notifier.ifd, paths[i].wd) < 0) {
- char log[BUFSZE] = {0,};
- int ret;
-
- ret = strerror_r(errno, log, sizeof(log));
- _E("Error: %s", ret == 0? log : "unknown error");
+ _E("Error: %s", strerror(errno));
}
paths[i].wd = 0;
}
diff --git a/src/starter.c b/src/starter.c
index c90601c..67bc680 100755
--- a/src/starter.c
+++ b/src/starter.c
@@ -30,6 +30,7 @@
#include <vconf.h>
#include <heynoti.h>
#include <signal.h>
+#include <system_info.h>
#include "starter.h"
#include "starter-util.h"
@@ -45,6 +46,7 @@
#define DEFAULT_THEME "tizen"
#define PWLOCK_PATH "/usr/apps/org.tizen.pwlock/bin/pwlock"
#define PWLOCK_PKG_NAME "org.tizen.pwlock"
+#define QP_EMUL_STR "Emulator"
static void lock_menu_screen(void)
{
@@ -82,12 +84,35 @@ static void _set_elm_theme(void)
free(vstr);
}
+static int _check_emul()
+{
+ int is_emul = 0;
+ char *info = NULL;
+
+ if (system_info_get_value_string(SYSTEM_INFO_KEY_MODEL, &info) == 0) {
+ if (info == NULL) return 0;
+ if (!strncmp(QP_EMUL_STR, info, strlen(info))) {
+ is_emul = 1;
+ }
+ }
+
+ if (info != NULL) free(info);
+
+ return is_emul;
+}
+
static int _launch_pwlock(void)
{
int r;
_DBG("%s", __func__);
+ if(_check_emul()) {
+ _DBG("Emulator => skip pwlock");
+ vconf_set_int(VCONFKEY_STARTER_SEQUENCE, 1);
+ return 0;
+ }
+
r = aul_launch_app(PWLOCK_PKG_NAME, NULL);
if (r < 0) {
_ERR("PWLock launch error: error(%d)", r);
@@ -152,7 +177,6 @@ static void _init(struct appdata *ad)
{
int r;
struct sigaction act;
- char *file = NULL;
memset(&act,0x00,sizeof(struct sigaction));
act.sa_sigaction = _signal_handler;
diff --git a/starter.manifest b/starter.manifest
index 2538fea..d2210a5 100755
--- a/starter.manifest
+++ b/starter.manifest
@@ -9,5 +9,8 @@
<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/core-efl.target.wants/starter.path" label="_" exec_label="none" />
</assign>
</manifest>