Merge branch 'master' into tizen

Signed-off-by: JuWan Kim <juwan.kim@samsung.com>
Change-Id: Icd1604105bd43bf0c703b227c3cc6490852e0535

diff --git a/src/views/BaseView/SortCtxPopup.cpp b/src/views/BaseView/SortCtxPopup.cpp
index 0145cb7..ba83457 100644 (file)
--- a/src/views/BaseView/SortCtxPopup.cpp
+++ b/src/views/BaseView/SortCtxPopup.cpp
@@ -24,6 +24,7 @@
 
 #include "Info.h"
 #include "CtxPopup.h"
+#include <app-res-defines.h>
 #include "SortCtxPopup.h"
 
 const char *sorttext[] = {
@@ -47,7 +48,7 @@ const char *sortbtnids[] = {
 void CSortCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(sorttext, ARRAY_SIZE(sorttext), (int)CInfo::SortType(),
-                       CCtxPopup::TOPBTN_SORT,
+                       CCtxPopup::TOPBTN_SORT, sortbtnids,
                        POSITION_SORT_POPUP_X, POSITION_SORT_POPUP_Y,
                        FBR_STYLE_HOVER_ENTRY,
                        FBR_STYLE_HOVER_CTXPOPUP, FBR_STYLE_HOVER_CTXPOPUP, FBR_STYLE_HOVER_CTXPOPUP);
@@ -59,7 +60,7 @@ void CSortCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
                return;
 
        int index = -1;
-       const char *id = (const char*)evas_object_data_get(obj, FBR_BTN_ID);
+       const char *id = (const char*)evas_object_data_get(obj, BTN_ID);
 
        if (!id)
                return;

diff --git a/src/views/BaseView/SourceCtxPopup.cpp b/src/views/BaseView/SourceCtxPopup.cpp
index f05d03c..c5ea658 100644 (file)
--- a/src/views/BaseView/SourceCtxPopup.cpp
+++ b/src/views/BaseView/SourceCtxPopup.cpp
@@ -25,6 +25,7 @@
 #include "CtxPopup.h"
 #include <MediaContentDbListener.h>
 #include <UsbConnectionListener.h>
+#include <app-res-defines.h>
 #include "SourceCtxPopup.h"
 
 const char *srcbtnids[] = {
@@ -50,7 +51,7 @@ void CSourceCtxPopup::t_OnConfiguration(void)
        usb.Destroy();
 
        t_SetList(sourcetext, size, (int)CInfo::SourceType(),
-                       CCtxPopup::TOPBTN_SOURCE,
+                       CCtxPopup::TOPBTN_SOURCE, srcbtnids,
                        POSITION_SOURCE_POPUP_X, POSITION_SOURCE_POPUP_Y,
                        FBR_STYLE_HOVER_CTXPOPUP,
                        FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY, FBR_STYLE_HOVER_ENTRY);
@@ -63,7 +64,7 @@ void CSourceCtxPopup::t_OnBtnClicked(Evas_Object* obj, void* ev)
                return;
 
        int index = -1;
-       const char *id = (const char*)evas_object_data_get(obj, FBR_BTN_ID);
+       const char *id = (const char*)evas_object_data_get(obj, BTN_ID);
 
        if (!id)
                return;