tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9a219891c4594ca0cf73706bf03879c3a05c94fd
commit 9a219891c4594ca0cf73706bf03879c3a05c94fd
Author: Tom Hacohen <t...@stosb.com>
Date: Thu Mar 13 15:14:59 2014 +0000
Remove silencing of errors when called on non elm widgets.
There was code to silence errors. Removing that exposed a lot of errors.
I fixed them as well. In general, elm_widget functions should only be called
on elm_widgets...
More of commit 5ac398b156e8fb0aa44c6cfe8a2b113eb7229fbf
---
src/lib/elm_segment_control.c | 3 +--
src/lib/elm_widget.c | 9 ++++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 00a9af9..5aede38 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -577,8 +577,7 @@ _item_new(Evas_Object *obj,
elm_widget_item_content_get_hook_set(it, _item_content_get_hook);
VIEW(it) = edje_object_add(evas_object_evas_get(obj));
- edje_object_scale_set
- (VIEW(it), elm_widget_scale_get(VIEW(it)) * elm_config_scale_get());
+ edje_object_scale_set(VIEW(it), elm_config_scale_get());
evas_object_smart_member_add(VIEW(it), obj);
elm_widget_sub_object_add(obj, VIEW(it));
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 9fa9426..ecc2abe 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -3403,15 +3403,18 @@ _elm_widget_focus_steal(Eo *obj, void *_pd, va_list
*list EINA_UNUSED)
sd = eo_data_scope_get(parent, MY_CLASS);
if (sd)
{
- if ((sd->resize_obj) && (elm_widget_focus_get(sd->resize_obj)))
- eo_do(sd->resize_obj, elm_wdg_focused_object_clear());
+ if (sd->resize_obj && elm_widget_is(sd->resize_obj) &&
+ elm_widget_focus_get(sd->resize_obj))
+ {
+ eo_do(sd->resize_obj, elm_wdg_focused_object_clear());
+ }
else
{
const Eina_List *l;
Evas_Object *child;
EINA_LIST_FOREACH(sd->subobjs, l, child)
{
- if (elm_widget_focus_get(child))
+ if (elm_widget_is(child) && elm_widget_focus_get(child))
{
eo_do(child, elm_wdg_focused_object_clear());
break;
--
