summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-05-30 11:14:43 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-05-30 11:14:43 +0900
commitc59d222f6da28442bc9213bd6ec42590494e67de (patch)
tree5bd3569b3533aeb5c3e044e45b14c155a3500ea9
parent62cf70034de38b17f2025e08f81b5758b3d6d6e3 (diff)
elm_hover: Fix crash with efl_part
This fixes T3714 Efl.Part uses a basic inheritance for layout objects, but somehow this completely falls apart when the child class overrides all the functions. Weird. I'll check that more.
-rw-r--r--src/lib/elementary/elm_hover.c8
-rw-r--r--src/lib/elementary/elm_hover_internal_part.eo5
2 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c
index d83efb055d..b669da3b1d 100644
--- a/src/lib/elementary/elm_hover.c
+++ b/src/lib/elementary/elm_hover.c
@@ -845,10 +845,10 @@ _elm_hover_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
845 845
846/* Efl.Part begin */ 846/* Efl.Part begin */
847 847
848ELM_PART_OVERRIDE(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 848ELM_PART_IMPLEMENT(elm_hover, ELM_HOVER, Elm_Hover_Data, Elm_Part_Data)
849ELM_PART_OVERRIDE_CONTENT_SET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 849ELM_PART_IMPLEMENT_CONTENT_SET(elm_hover, ELM_HOVER, Elm_Hover_Data, Elm_Part_Data)
850ELM_PART_OVERRIDE_CONTENT_GET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 850ELM_PART_IMPLEMENT_CONTENT_GET(elm_hover, ELM_HOVER, Elm_Hover_Data, Elm_Part_Data)
851ELM_PART_OVERRIDE_CONTENT_UNSET(elm_hover, ELM_HOVER, ELM_LAYOUT, Elm_Hover_Data, Elm_Part_Data) 851ELM_PART_IMPLEMENT_CONTENT_UNSET(elm_hover, ELM_HOVER, Elm_Hover_Data, Elm_Part_Data)
852#include "elm_hover_internal_part.eo.c" 852#include "elm_hover_internal_part.eo.c"
853 853
854/* Efl.Part end */ 854/* Efl.Part end */
diff --git a/src/lib/elementary/elm_hover_internal_part.eo b/src/lib/elementary/elm_hover_internal_part.eo
index 80df3ae486..6506561d95 100644
--- a/src/lib/elementary/elm_hover_internal_part.eo
+++ b/src/lib/elementary/elm_hover_internal_part.eo
@@ -1,7 +1,8 @@
1class Elm.Hover.Internal.Part (Elm.Layout.Internal.Part) 1class Elm.Hover.Internal.Part (Eo.Base, Efl.Container)
2{ 2{
3 data: null; 3 data: Elm_Part_Data;
4 implements { 4 implements {
5 Eo.Base.destructor;
5 Efl.Container.content.set; 6 Efl.Container.content.set;
6 Efl.Container.content.get; 7 Efl.Container.content.get;
7 Efl.Container.content_unset; 8 Efl.Container.content_unset;