[FIX] screen capture on back button press

Change-Id: Ic3fef88429a06f7ad056cf8c2e098d3313561429
Signed-off-by: Vitaliy Cherepanov <v.cherepanov@samsung.com>

diff --git a/Makefile b/Makefile
index f6dae95..0a5906e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,8 +90,8 @@ PROBE_SRCS =                                  \
 
 DUMMY_SRCS = ./custom_chart/da_chart_dummy.c
 CAPI_SRCS =    $(COMMON_SRCS)                  \
-               ./probe_capi/capi_appfw.c
-#              ./probe_ui/capi_capture.c
+               ./probe_capi/capi_appfw.c               \
+               ./probe_ui/capi_capture.c
 
 TIZEN_SRCS =   $(COMMON_SRCS) $(CAPI_SRCS)\
                ./helper/addr-tizen.c                                           \

diff --git a/helper/dahelper.c b/helper/dahelper.c
index 040afe3..a5916f6 100755 (executable)
--- a/helper/dahelper.c
+++ b/helper/dahelper.c
@@ -40,7 +40,7 @@ int app_efl_main_flg = 0;
 const char *lib_string[NUM_ORIGINAL_LIBRARY] = {
        "libc.so.6",                            //0
        "libpthread.so.0",                      //1
-       "libelementary.so",                     //2
+       "libelementary.so.1",                   //2
        "libecore_input_evas.so.1",             //3
        "libdaemon.so.0",                       //4
        "libcapi-appfw-application.so.0",       //5

diff --git a/helper/libdaprobe.c b/helper/libdaprobe.c
index 16d40e5..bad63c8 100755 (executable)
--- a/helper/libdaprobe.c
+++ b/helper/libdaprobe.c
@@ -95,6 +95,10 @@ static void _configure(char* configstr)
        gTraceInfo.optionflag = atoll(configstr);
 
        sprintf(buf, "configure in probe : %s, %llx\n", configstr, gTraceInfo.optionflag);
+       if isOptionEnabled(OPT_SNAPSHOT)
+               SCREENSHOT_SET();
+       else
+               SCREENSHOT_UNSET();
        PRINTMSG(buf);
 }
 

diff --git a/include/dahelper.h b/include/dahelper.h
index 1cffa8e..ae10019 100755 (executable)
--- a/include/dahelper.h
+++ b/include/dahelper.h
@@ -130,7 +130,7 @@ extern int app_efl_main_flg;
                pthread_mutex_lock(&(gTraceInfo.screenshot.ssMutex));   \
                old = gTraceInfo.screenshot.state;                                              \
                if(gTraceInfo.screenshot.state == 2)                                    \
-                       gTraceInfo.screenshot.state = 0;                                        \
+                       gTraceInfo.screenshot.state = 1;                                        \
                pthread_mutex_unlock(&(gTraceInfo.screenshot.ssMutex)); \
                if(old == 2) {                                                                                  \
                        if(isOptionEnabled(OPT_SNAPSHOT))                                       \

diff --git a/probe_ui/capi_capture.c b/probe_ui/capi_capture.c
index 8ec7fbd..2c713ee 100755 (executable)
--- a/probe_ui/capi_capture.c
+++ b/probe_ui/capi_capture.c
@@ -28,17 +28,8 @@
  *
  */
 
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <dlfcn.h>
-//#include <stdbool.h>
-//#include <memory.h>
-//#include <errno.h>
-
 #include <Evas.h>
 #include <Elementary.h>
-//#include <app.h>
 
 #include "daprobe.h"
 #include "probeinfo.h"
@@ -49,27 +40,21 @@ Evas_Object *elm_win_add(Evas_Object *parent, const char* name, Elm_Win_Type typ
        static Evas_Object * (*elm_win_addp)(Evas_Object *parent, const char* name, Elm_Win_Type type);
 
        BEFORE_ORIGINAL_SNAPSHOT(elm_win_add, LIBELEMENTARY);
-
        ret = elm_win_addp(parent, name, type);
-
        AFTER_ORIGINAL_SNAPSHOT(ret);
 
        return ret;
 }
 
-Evas_Object *  elm_controlbar_add (Evas_Object *parent)
+Evas_Object *elm_controlbar_add (Evas_Object *parent)
 {
        static Evas_Object * (*elm_controlbar_addp)(Evas_Object *parent);
 
        BEFORE_ORIGINAL_SNAPSHOT(elm_controlbar_add, LIBELEMENTARY);
-
        ret = elm_controlbar_addp(parent);
-
        AFTER_ORIGINAL_SNAPSHOT(ret);
 
        return ret;
-
-//     ecore_evas_callback_post_render_set(ecore_evas_ecore_evas_get(evas_object_evas_get(parent)), _cbecore);
 }
 
 Evas_Object *elm_naviframe_add(Evas_Object *parent)
@@ -77,9 +62,7 @@ Evas_Object *elm_naviframe_add(Evas_Object *parent)
        static Evas_Object * (*elm_naviframe_addp)(Evas_Object *parent);
 
        BEFORE_ORIGINAL_SNAPSHOT(elm_naviframe_add, LIBELEMENTARY);
-
        ret = elm_naviframe_addp(parent);
-
        AFTER_ORIGINAL_SNAPSHOT(ret);
 
        return ret;
@@ -90,9 +73,7 @@ Evas_Object *elm_pager_add(Evas_Object *parent)
        static Evas_Object * (*elm_pager_addp)(Evas_Object *parent);
 
        BEFORE_ORIGINAL_SNAPSHOT(elm_pager_add, LIBELEMENTARY);
-
        ret = elm_pager_addp(parent);
-
        AFTER_ORIGINAL_SNAPSHOT(ret);
 
        return ret;