From 2dc29cfbfd55bf3004a41ee622e752f772b05eab Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Fri, 9 Jun 2017 16:51:43 +0900
Subject: [PATCH] edje: Remove bool return from scale_set

It was always returning true. There is little point in returning
a bool here, an invalid scale value (eg. <= 0) wouuld lead to a
state where scale_get() != scale_set() and that's about it.
---
 src/lib/edje/edje_legacy.c            | 3 ++-
 src/lib/edje/edje_util.c              | 6 ++----
 src/lib/efl/interfaces/efl_ui_base.eo | 1 -
 src/lib/elementary/elm_widget.c       | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 3fcedcec7f..76586080d2 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -120,7 +120,8 @@ EAPI const char *edje_object_language_get(const Edje_Object *obj)
 
 EAPI Eina_Bool edje_object_scale_set(Edje_Object *obj, double scale)
 {
-   return efl_ui_scale_set(obj, scale);
+   efl_ui_scale_set(obj, scale);
+   return EINA_TRUE;
 }
 
 EAPI double edje_object_scale_get(const Edje_Object *obj)
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index db1d0d0798..e76077e50a 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -363,7 +363,7 @@ edje_password_show_last_timeout_set(double password_show_last_timeout)
    _edje_password_show_last_timeout = password_show_last_timeout;
 }
 
-EOLIAN Eina_Bool
+EOLIAN void
 _edje_object_efl_ui_base_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
 {
    Edje *ged;
@@ -371,7 +371,7 @@ _edje_object_efl_ui_base_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
    Eina_List *l;
    unsigned short i;
 
-   if (EQ(ed->scale, FROM_DOUBLE(scale))) return EINA_TRUE;
+   if (EQ(ed->scale, FROM_DOUBLE(scale))) return;
    ed->scale = FROM_DOUBLE(scale);
    EINA_LIST_FOREACH(ed->groups, l, ged)
      edje_object_scale_set(ged->obj, scale);
@@ -387,8 +387,6 @@ _edje_object_efl_ui_base_scale_set(Eo *obj EINA_UNUSED, Edje *ed, double scale)
           }
      }
    _edje_recalc(ed);
-
-   return EINA_TRUE;
 }
 
 EOLIAN double
diff --git a/src/lib/efl/interfaces/efl_ui_base.eo b/src/lib/efl/interfaces/efl_ui_base.eo
index 8e49edb4dd..b4bd11d2c0 100644
--- a/src/lib/efl/interfaces/efl_ui_base.eo
+++ b/src/lib/efl/interfaces/efl_ui_base.eo
@@ -48,7 +48,6 @@ interface Efl.Ui.Base
          ]]
          set {
             [[Sets the scaling factor of an object.]]
-            return: bool; [[$true on success, $false otherwise]]
          }
          get {
             [[Gets an object's scaling factor.]]
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 5c50d51371..c3abb76165 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -3664,7 +3664,7 @@ _elm_widget_scroll_freeze_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
    return sd->scroll_freeze;
 }
 
-EOLIAN static Eina_Bool
+EOLIAN static void
 _elm_widget_efl_ui_base_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double scale)
 {
    if (scale < 0.0) scale = 0.0;
@@ -3673,7 +3673,6 @@ _elm_widget_efl_ui_base_scale_set(Eo *obj, Elm_Widget_Smart_Data *sd, double sca
         sd->scale = scale;
         elm_widget_theme(obj);
      }
-   return EINA_TRUE;
 }
 
 EOLIAN static double