Yes as discussed privately that is fine. On Fri, Jun 22, 2018 at 5:49 PM, Mike Blumenkrantz <[email protected]> wrote: > Hi, > > This directly conflicts with https://phab.enlightenment.org/D6343 which was > submitted through patch review instead of being directly pushed to the repo. > Please submit patches through the review system in the future in order to > avoid this type of conflict. > > Thanks, > Mike > > On Fri, Jun 22, 2018 at 4:12 AM Alastair Poole <[email protected]> wrote: >> >> netstar pushed a commit to branch master. >> >> >> http://git.enlightenment.org/core/efl.git/commit/?id=91e146f108d12f1369f26f839b48be5901373df2 >> >> commit 91e146f108d12f1369f26f839b48be5901373df2 >> Author: Alastair Poole <[email protected]> >> Date: Fri Jun 22 09:11:32 2018 +0100 >> >> efl_ui_widget: silence warnings with clang. >> >> Clang doesn't like dangling else. >> --- >> src/lib/elementary/efl_ui_widget.c | 40 >> +++++++++++++++++++++++--------------- >> 1 file changed, 24 insertions(+), 16 deletions(-) >> >> diff --git a/src/lib/elementary/efl_ui_widget.c >> b/src/lib/elementary/efl_ui_widget.c >> index 12377d4718..df8fe6020a 100644 >> --- a/src/lib/elementary/efl_ui_widget.c >> +++ b/src/lib/elementary/efl_ui_widget.c >> @@ -2654,10 +2654,12 @@ _efl_ui_widget_scroll_hold_push(Eo *obj, >> Elm_Widget_Smart_Data *sd) >> EINA_LIST_FOREACH(sd->subobjs, l, child) >> { >> if (elm_widget_is(child) && _elm_scrollable_is(child)) >> - if (elm_widget_is_legacy(obj)) >> - elm_interface_scrollable_hold_set(child, >> EINA_TRUE); >> - else >> - efl_ui_scrollable_scroll_hold_set(child, >> EINA_TRUE); >> + { >> + if (elm_widget_is_legacy(obj)) >> + elm_interface_scrollable_hold_set(child, >> EINA_TRUE); >> + else >> + efl_ui_scrollable_scroll_hold_set(child, >> EINA_TRUE); >> + } >> } >> } >> } >> @@ -2686,10 +2688,12 @@ _efl_ui_widget_scroll_hold_pop(Eo *obj, >> Elm_Widget_Smart_Data *sd) >> EINA_LIST_FOREACH(sd->subobjs, l, child) >> { >> if (elm_widget_is(child) && _elm_scrollable_is(child)) >> - if (elm_widget_is_legacy(obj)) >> - elm_interface_scrollable_hold_set(child, >> EINA_FALSE); >> - else >> - efl_ui_scrollable_scroll_hold_set(child, >> EINA_FALSE); >> + { >> + if (elm_widget_is_legacy(obj)) >> + elm_interface_scrollable_hold_set(child, >> EINA_FALSE); >> + else >> + efl_ui_scrollable_scroll_hold_set(child, >> EINA_FALSE); >> + } >> } >> } >> } >> @@ -2727,10 +2731,12 @@ _efl_ui_widget_scroll_freeze_push(Eo *obj, >> Elm_Widget_Smart_Data *sd) >> EINA_LIST_FOREACH(sd->subobjs, l, child) >> { >> if (elm_widget_is(child) && _elm_scrollable_is(child)) >> - if (elm_widget_is_legacy(obj)) >> - elm_interface_scrollable_freeze_set(child, >> EINA_TRUE); >> - else >> - efl_ui_scrollable_scroll_freeze_set(child, >> EINA_TRUE); >> + { >> + if (elm_widget_is_legacy(obj)) >> + elm_interface_scrollable_freeze_set(child, >> EINA_TRUE); >> + else >> + efl_ui_scrollable_scroll_freeze_set(child, >> EINA_TRUE); >> + } >> } >> } >> } >> @@ -2759,10 +2765,12 @@ _efl_ui_widget_scroll_freeze_pop(Eo *obj, >> Elm_Widget_Smart_Data *sd) >> EINA_LIST_FOREACH(sd->subobjs, l, child) >> { >> if (elm_widget_is(child) && _elm_scrollable_is(child)) >> - if (elm_widget_is_legacy(obj)) >> - elm_interface_scrollable_freeze_set(child, >> EINA_FALSE); >> - else >> - efl_ui_scrollable_scroll_freeze_set(child, >> EINA_FALSE); >> + { >> + if (elm_widget_is_legacy(obj)) >> + elm_interface_scrollable_freeze_set(child, >> EINA_FALSE); >> + else >> + efl_ui_scrollable_scroll_freeze_set(child, >> EINA_FALSE); >> + } >> } >> } >> } >> >> -- >> >> >
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
