diff options
author | Jaeho Lee <jaeho81.lee@samsung.com> | 2013-04-06 14:46:11 +0900 |
---|---|---|
committer | Jaeho Lee <jaeho81.lee@samsung.com> | 2013-04-06 14:46:11 +0900 |
commit | b19163968c9a97cd30cb2048c0ecb7ac8c728257 (patch) | |
tree | 1fca1c2f67da3862c1f810a090f00fefa4476ffc | |
parent | afe0c68315b6f78a980c2ad82a234101f5882b32 (diff) | |
parent | debc9606587b270695f2867af5d5c842b350af05 (diff) | |
download | app-core-b19163968c9a97cd30cb2048c0ecb7ac8c728257.tar.gz app-core-b19163968c9a97cd30cb2048c0ecb7ac8c728257.tar.bz2 app-core-b19163968c9a97cd30cb2048c0ecb7ac8c728257.zip |
Merge branch 'master' into tizen_2.1
added new API
Conflicts:
packaging/app-core.spec
Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
-rw-r--r-- | packaging/app-core.spec | 2 | ||||
-rwxr-xr-x | src/appcore-efl.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/packaging/app-core.spec b/packaging/app-core.spec index 6aac880..6dec867 100644 --- a/packaging/app-core.spec +++ b/packaging/app-core.spec @@ -1,7 +1,7 @@ Name: app-core Summary: Application basic Version: 1.2 -Release: 44 +Release: 45 Group: Application Framework License: Apache License, Version 2.0 Source0: app-core-%{version}.tar.gz diff --git a/src/appcore-efl.c b/src/appcore-efl.c index 238b523..29f2c8a 100755 --- a/src/appcore-efl.c +++ b/src/appcore-efl.c @@ -960,3 +960,10 @@ EXPORT_API int appcore_set_system_resource_reclaiming(bool enable) return 0; } + +EXPORT_API int appcore_set_app_state(int state) +{ + priv.state = state; + + return 0; +} |