[Tizen-submit] 19718: Changes to Tizen:IVI/wrt

noreply at tizen.org noreply at tizen.org
Thu Jan 16 16:23:41 GMT 2014


Hi,
Baptiste DURAND have made the following changes to wrt in project Tizen:IVI. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #19718

  submit:       Tizen:IVI:build/wrt(cleanup) -> Tizen:IVI


Message:
Submitter: Baptiste DURAND <baptiste.durand at open.eurogiciel.org>
Comments: Add fix related to popup management (for TIVI-2144)
Git project: platform/framework/web/wrt
Tag: submit/tizen/20140116.162235
Commit: 8ac2c47d4032be832d84eeb102ad948cc3552998 Fix TIVI-2144 : current version of elementary 1.7 define the popup class type as "popup" instead of "elm_popup".

State:   new        2014-01-16T16:21:03 tizenrobot
Comment: <no comment>
changes files:
--------------

spec files:
-----------
--- wrt.spec
+++ wrt.spec
@@ -4,7 +4,7 @@
 %bcond_with multi_user
 
 Name:       wrt
-VCS:        platform/framework/web/wrt#1cd988f1556d26b7de158ca0e43a8a91aba1e8a6
+VCS:        platform/framework/web/wrt#8ac2c47d4032be832d84eeb102ad948cc3552998
 Summary:    web runtime
 Version:    0.8.288
 Release:    1

other changes:
--------------

++++++ wrt-0.8.288.tar.gz
--- src/view/common/view_logic_certificate_support.cpp
+++ src/view/common/view_logic_certificate_support.cpp
@@ -36,6 +36,12 @@
 #include <widget_string.h>
 #include <common/view_logic_get_parent_window_util.h>
 
+#if (ELM_VERSION_MAJOR == 1 && ELM_VERSION_MINOR == 7)
+#define POPUP_CLASSNAME "popup"
+#else
+//#if ELM_VERSION_MAJOR == 1 && ELM_VERSION_MINOR == 8)
+#define POPUP_CLASSNAME "elm_popup"
+#endif
 namespace ViewModule {
 namespace {
 const double MAX_POPUP_HEIGHT = 0.80;
@@ -219,7 +225,7 @@
     Assert(button);
 
     Evas_Object* popup = button;
-    while (strcmp(elm_object_widget_type_get(popup), "elm_popup")) {
+    while (strcmp(elm_object_widget_type_get(popup), POPUP_CLASSNAME)) {
         popup = elm_object_parent_widget_get(popup);
         if (!popup) {
             return NULL;
@@ -231,7 +237,7 @@
 Evas_Object* CertificateSupportUtil::getCheck(Evas_Object* popup)
 {
     Assert(popup);
-    if (strcmp(elm_object_widget_type_get(popup), "elm_popup")) {
+    if (strcmp(elm_object_widget_type_get(popup), POPUP_CLASSNAME)) {
         return NULL;
     }
     Evas_Object* check = elm_object_part_content_get(
--- src/view/common/view_logic_security_origin_support.cpp
+++ src/view/common/view_logic_security_origin_support.cpp
@@ -36,6 +36,13 @@
 #include <widget_string.h>
 #include <common/view_logic_get_parent_window_util.h>
 
+
+#if (ELM_VERSION_MAJOR == 1 && ELM_VERSION_MINOR == 7)
+#define POPUP_CLASSNAME "popup"
+#else
+//#if ELM_VERSION_MAJOR == 1 && ELM_VERSION_MINOR == 8)
+#define POPUP_CLASSNAME "elm_popup"
+#endif
 namespace ViewModule {
 namespace {
 const double MAX_POPUP_HEIGHT = 0.80;
@@ -214,7 +221,7 @@
     Assert(button);
 
     Evas_Object* popup = button;
-    while (strcmp(elm_object_widget_type_get(popup), "elm_popup")) {
+    while (strcmp(elm_object_widget_type_get(popup), POPUP_CLASSNAME )) {
         popup = elm_object_parent_widget_get(popup);
         if (!popup) {
             return NULL;
@@ -226,7 +233,7 @@
 Evas_Object* SecurityOriginSupportUtil::getCheck(Evas_Object* popup)
 {
     Assert(popup);
-    if (strcmp(elm_object_widget_type_get(popup), "elm_popup")) {
+    if (strcmp(elm_object_widget_type_get(popup), POPUP_CLASSNAME )) {
         return NULL;

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list