Merge branch 'master' into tizen_2.1

added new API

Conflicts:
	packaging/app-core.spec

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cfec5a..a71f39d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ SET(SRCS_efl src/appcore-efl.c)
 SET(HEADERS_efl appcore-efl.h)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkg_efl REQUIRED elementary dlog ecore ecore-x gobject-2.0 glib-2.0)
+pkg_check_modules(pkg_efl REQUIRED elementary dlog ecore ecore-x gobject-2.0 glib-2.0 aul)
 FOREACH(flag ${pkg_efl_CFLAGS})
        SET(EXTRA_CFLAGS_efl "${EXTRA_CFLAGS_efl} ${flag}")
 ENDFOREACH(flag)

diff --git a/packaging/app-core.spec b/packaging/app-core.spec
index 8e48942..6dec867 100644 (file)
--- a/packaging/app-core.spec
+++ b/packaging/app-core.spec
@@ -1,7 +1,7 @@
 Name:       app-core
 Summary:    Application basic
 Version:    1.2
-Release:    42
+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 27ecd94..29f2c8a 100755 (executable)
--- a/src/appcore-efl.c
+++ b/src/appcore-efl.c
@@ -39,6 +39,7 @@
 #include <malloc.h>
 #include <glib.h>
 #include <stdbool.h>
+#include <aul.h>
 #include "appcore-internal.h"
 #include "appcore-efl.h"
 
@@ -119,6 +120,10 @@ struct win_node {
 
 static struct ui_wm_rotate wm_rotate;
 
+static inline int send_int(int fd, int val)
+{
+       return write(fd, &val, sizeof(int));
+}
 
 static inline int send_str(int fd, char *str)
 {
@@ -531,6 +536,9 @@ static Ecore_X_Atom _WM_WINDOW_ROTATION_CHANGE_REQUEST = 0;
 
 static int __check_wm_rotation_support(void)
 {
+       _DBG("Disable window manager rotation");
+       return -1;
+
        Ecore_X_Window root, win, win2;
        int ret;
 
@@ -937,6 +945,8 @@ EXPORT_API int appcore_efl_main(const char *name, int *argc, char ***argv,
 
        elm_run();
 
+       aul_status_update(STATUS_DYING);
+
        __after_loop(&priv);
 
        __unset_data(&priv);