Merge "Remove conditional compilation associated with window manager" into tizen

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58e0e4b..3ec39fe 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
+SET(VERSION ${FULLVER})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 

diff --git a/src/appcore-efl.c b/src/appcore-efl.c
index 2c0a8a5..aca08fe 100644 (file)
--- a/src/appcore-efl.c
+++ b/src/appcore-efl.c
@@ -75,7 +75,6 @@ struct ui_priv {
        int (*rot_cb) (void *event_info, enum appcore_rm, void *);
        void *rot_cb_data;
        enum appcore_rm rot_mode;
-       bundle *pending_data;
        char *below_app;
 };
 
@@ -394,9 +393,6 @@ static void __do_app(enum app_event event, void *data, bundle * b)
        switch (event) {
        case AE_RESET:
                _DBG("[APP %d] RESET", _pid);
-               if (ui->pending_data)
-                       bundle_free(ui->pending_data);
-               ui->pending_data = bundle_dup(b);
                LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:start]", ui->name);
 
                if (ui->below_app) {
@@ -473,11 +469,6 @@ static void __do_app(enum app_event event, void *data, bundle * b)
                if (ui->state == AS_PAUSED || ui->state == AS_CREATED) {
                        _DBG("[APP %d] RESUME", _pid);
 
-                       if (ui->state == AS_CREATED) {
-                               bundle_free(ui->pending_data);
-                               ui->pending_data = NULL;
-                       }
-
                        if (ui->ops->resume) {
                                traceBegin(TTRACE_TAG_APPLICATION_MANAGER,
                                        "APPCORE:RESUME");