fix .eo file breaks

7 files changed, 15 insertions, 8 deletions

diff --git a/src/lib/eet/eet_lib.c b/src/lib/eet/eet_lib.c
index d2c95c220c..85ec2efe67 100644
--- a/src/lib/eet/eet_lib.c
+++ b/src/lib/eet/eet_lib.c
@@ -41,6 +41,8 @@ EAPI Eet_Version *eet_version = &_version;
 # undef HAVE_REALPATH
 #endif /* ifdef HAVE_REALPATH */
 
+#define EET_OLD_EET_FILE_FORMAT 1
+
 #define EET_MAGIC_FILE        0x1ee7ff00
 #define EET_MAGIC_FILE_HEADER 0x1ee7ff01
 
@@ -1477,7 +1479,7 @@ eet_mmap(const Eina_File *file)
 
    if (ef->mode == EET_FILE_MODE_READ)
      eet_cache_add(ef, &eet_readers, &eet_readers_num, &eet_readers_alloc);
-   
+
  done:
    UNLOCK_CACHE;
    return ef;
diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.eo b/src/lib/elementary/efl_ui_focus_manager_sub.eo
index 73af27a9fc..9496d0eeb1 100644
--- a/src/lib/elementary/efl_ui_focus_manager_sub.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_sub.eo
@@ -17,6 +17,6 @@ class Efl.Ui.Focus.Manager.Sub (Efl.Ui.Focus.Manager, Efl.Object)
     implements {
         Efl.Object.constructor;
         Efl.Object.destructor;
-        Efl.Object.parent.set;
+        Efl.Object.parent { set; }
     }
 }
\ No newline at end of file
diff --git a/src/lib/elementary/efl_ui_focus_object.eo b/src/lib/elementary/efl_ui_focus_object.eo
index 106d09cf15..362ec3e2ae 100644
--- a/src/lib/elementary/efl_ui_focus_object.eo
+++ b/src/lib/elementary/efl_ui_focus_object.eo
@@ -24,7 +24,7 @@ mixin Efl.Ui.Focus.Object
     }
     implements {
         @empty .geometry_get;
-        @empty .focus.get;
+        @empty .focus { get; }
     }
     events {
         focus,changed : bool; [[Emitted if the focus state has changed]]
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 830c452cd6..0dea095930 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -573,6 +573,8 @@ class Elm.Gengrid (Elm.Layout, Elm.Interface_Scrollable,
       Elm.Interface.Atspi.Selection.is_child_selected;
       Elm.Interface.Atspi.Selection.all_children_select;
       Elm.Interface.Atspi.Selection.clear;
+      Efl.Ui.Focus.Manager.register;
+      Efl.Ui.Focus.Manager.unregister;
    }
    events {
       realized; [[Called when gengrid realized]]
diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo
index e27d05b19d..99095ef04a 100644
--- a/src/lib/elementary/elm_gengrid_item.eo
+++ b/src/lib/elementary/elm_gengrid_item.eo
@@ -23,7 +23,7 @@ enum Elm.Gengrid.Item.Field_Type
 }
 
 
-class Elm.Gengrid.Item(Elm.Widget.Item)
+class Elm.Gengrid.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Gfx)
 {
       [[Elementary gengrid item class]]
       legacy_prefix: elm_gengrid_item;
@@ -238,6 +238,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item)
       }
       implements {
            Efl.Object.constructor;
+           Efl.Object.destructor;
            Elm.Widget.Item.del_pre;
            Elm.Widget.Item.disable;
            Elm.Widget.Item.signal_emit;
@@ -253,5 +254,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item)
            Elm.Widget.Item.cursor_unset;
            Elm.Interface.Atspi_Accessible.name { get; }
            Elm.Interface.Atspi_Accessible.state_set { get; }
+           Efl.Ui.Focus.Object.geometry_get;
+           Efl.Gfx.geometry { get; }
       }
 }
diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo
index e3c1b91014..9aaf007e86 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -681,7 +681,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Canvas.Group, Efl.Ui.Focus
       Efl.Object.constructor;
       Efl.Canvas.Group.group_add;
       Efl.Canvas.Group.group_del;
-      Efl.Ui.Focus.Manager.border_elements.get;
+      Efl.Ui.Focus.Manager.border_elements { get; }
    }
    events {
       changed; [[Called when content changed]]
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 2c3c3ac330..aca6e31544 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -854,10 +854,10 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
       Elm.Interface.Atspi_Accessible.parent { get; }
       Elm.Interface.Atspi_Accessible.attributes { get; }
       Elm.Interface.Atspi_Component.focus_grab;
-      Efl.Ui.Focus.User.manager.get;
-      Efl.Ui.Focus.User.parent.get;
+      Efl.Ui.Focus.User.manager { get; }
+      Efl.Ui.Focus.User.parent { get; }
       Efl.Ui.Focus.Object.geometry_get;
-      Efl.Ui.Focus.Object.focus.set;
+      Efl.Ui.Focus.Object.focus { set; }
    }
    events {
       moved; [[Called when widget moved]]