merge maruskin_operation.c & maruskin_keymap.c

Change-Id: I1466e2f7306f2cf674f818e40eaf8c37050b401e
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/skin/maruskin_keymap.c b/tizen/src/skin/maruskin_keymap.c
index 29d7ca302d5480fb00a679d939d3c39419fe129f..82f884ab2811415748c83768871b5417764ae531 100644 (file)
--- a/tizen/src/skin/maruskin_keymap.c
+++ b/tizen/src/skin/maruskin_keymap.c
@@ -29,7 +29,7 @@
 
 #include "maruskin_keymap.h"
 #include "emul_state.h"
-#include "console.h"
+#include "ui/console.h"
 #include "debug_ch.h"
 
 MULTI_DEBUG_CHANNEL(qemu, skin_keymap);

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 41ab4914201c61d2c560a88aa9508b22a84905d2..8aaf53545697ff63480d251db544a707a84396e6 100644 (file)
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -337,12 +337,14 @@ void send_rotation_event(int rotation_type)
 
 QemuSurfaceInfo* get_screenshot_info(void)
 {
+#if 0
     DisplaySurface* qemu_display_surface = get_qemu_display_surface();
 
     if ( !qemu_display_surface ) {
         ERR( "qemu surface is NULL.\n" );
         return NULL;
     }
+#endif
 
     QemuSurfaceInfo* info = (QemuSurfaceInfo*) g_malloc0( sizeof(QemuSurfaceInfo) );
     if ( !info ) {
@@ -350,7 +352,7 @@ QemuSurfaceInfo* get_screenshot_info(void)
         return NULL;
     }
 
-    int length = qemu_display_surface->linesize * qemu_display_surface->height;
+    int length = get_emul_lcd_width() * get_emul_lcd_height() * 4;
     INFO( "screenshot data length:%d\n", length );
 
     if ( 0 >= length ) {
@@ -591,7 +593,8 @@ static void send_to_emuld(const char* request_type,
     int s = 0;
 
     snprintf(addr, 128, ":%u", (uint16_t) (tizen_base_port + SDB_TCP_EMULD_INDEX));
-    s = inet_connect(addr, true, NULL, NULL);
+    //TODO: Error handling
+    s = inet_connect(addr, NULL);
 
     if ( s < 0 ) {
         ERR( "can't create socket to emulator daemon in guest\n" );