summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-11-24 16:23:48 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-24 16:27:54 +0900
commit9fbd9497b0c354778163b35986a2e79910171db4 (patch)
treeb34511c54c5900a8e5a77954373059fdf440b2f1
parentdee149f3aae2cc44ee5614dbfa0e467ae3237301 (diff)
layout: Fix erroneous warnings (from earlier patch)
Oops. Bad check :)
-rw-r--r--src/lib/elementary/efl_ui_layout.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index abe8554..15534c7 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -2391,12 +2391,13 @@ _efl_ui_layout_efl_part_part(const Eo *obj, Efl_Ui_Layout_Data *sd, const char *
2391 { 2391 {
2392 if (type != EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW) 2392 if (type != EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW)
2393 { 2393 {
2394 if (type < EFL_CANVAS_LAYOUT_PART_TYPE_LAST) 2394 if (type < EFL_CANVAS_LAYOUT_PART_TYPE_LAST &&
2395 type > EFL_CANVAS_LAYOUT_PART_TYPE_NONE)
2395 { 2396 {
2396 const char *file = NULL, *key = NULL; 2397 const char *file = NULL, *key = NULL;
2397 efl_file_get(wd->resize_obj, &file, &key); 2398 efl_file_get(wd->resize_obj, &file, &key);
2398 WRN("Layout has a background but it's not a swallow: '%s:%s'", 2399 WRN("Layout has a background but it's not a swallow: '%s'",
2399 file, key); 2400 sd->group);
2400 } 2401 }
2401 return efl_part(efl_super(obj, MY_CLASS), part); 2402 return efl_part(efl_super(obj, MY_CLASS), part);
2402 } 2403 }
@@ -2421,7 +2422,7 @@ _efl_ui_layout_efl_part_part(const Eo *obj, Efl_Ui_Layout_Data *sd, const char *
2421 case EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW: 2422 case EFL_CANVAS_LAYOUT_PART_TYPE_SWALLOW:
2422 return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, part); 2423 return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CONTENT_CLASS, obj, part);
2423 case EFL_CANVAS_LAYOUT_PART_TYPE_NONE: 2424 case EFL_CANVAS_LAYOUT_PART_TYPE_NONE:
2424 DBG("No such part '%s' in group '%s'", part, sd->group); 2425 WRN("No such part '%s' in group '%s'", part, sd->group);
2425 return NULL; 2426 return NULL;
2426 default: 2427 default:
2427 return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CLASS, obj, part); 2428 return ELM_PART_IMPLEMENT(EFL_UI_LAYOUT_PART_CLASS, obj, part);