Fix for migration missing patch (2f007f7a08 ~ 15e9605b7d)

Change-Id: I36bb214898a99a2ae39a0b6349498a895452de0b

diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 0a071fd..33f6329 100644 (file)
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -423,7 +423,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
 
             @since 1.16]]
           params {
-             @in next_item: Elm.Widget.Item @nullable; [[Focus next object item]]
+             @in next_item: Efl.Ui.Widget @nullable; [[Focus next object item]]
              @in dir: Efl.Ui.Focus.Direction; [[Focus direction]]
           }
        }
@@ -431,7 +431,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
           [[Get the next object item with specific focus direction.
 
             @since 1.16]]
-          return: Elm.Widget.Item; [[Focus next object item]]
+          return: Efl.Ui.Widget; [[Focus next object item]]
           params {
              @in dir: Efl.Ui.Focus.Direction; [[Focus direction]]
           }
@@ -464,7 +464,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
              @in base: const(Efl.Canvas.Object); [[Base object]]
              @in degree: double; [[Degree]]
              @out direction: Efl.Canvas.Object; [[Direction]]
-             @out direction_item: Elm.Widget.Item; [[Direction item]]
+             @out direction_item: Efl.Ui.Widget; [[Direction item]]
              @out weight: double; [[Weight]]
           }
           return: bool; [[$true on success, $false otherwise]]
@@ -482,7 +482,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
              @in list_data_get: void_ptr; [[Data get function]]
              @in degree: double; [[Degree]]
              @out direction: Efl.Canvas.Object; [[Direction]]
-             @out direction_item: Elm.Widget.Item; [[Direction item]]
+             @out direction_item: Efl.Ui.Widget; [[Direction item]]
              @out weight: double; [[Weight]]
           }
        }
@@ -502,7 +502,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
           params {
              @in dir: Efl.Ui.Focus.Direction; [[Focus direction]]
              @out next: Efl.Canvas.Object; [[Next object]]
-             @out next_item: Elm.Widget.Item; [[Next item]]
+             @out next_item: Efl.Ui.Widget; [[Next item]]
           }
        }
        focus_restore @beta {
@@ -520,7 +520,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
        focus_steal @beta {
           [[Steal focus]]
           params {
-             @in item: Elm.Widget.Item @nullable; [[Widget to steal focus from]]
+             @in item: Efl.Ui.Widget @nullable; [[Widget to steal focus from]]
           }
        }
        focus_hide_handle @beta {
@@ -531,7 +531,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
           params {
              @in dir: Efl.Ui.Focus.Direction; [[Focus direction]]
              @out next: Efl.Canvas.Object; [[Next object]]
-             @out next_item: Elm.Widget.Item; [[Next item]]
+             @out next_item: Efl.Ui.Widget; [[Next item]]
           }
           return: bool; [[$true on success, $false otherwise]]
        }
@@ -543,7 +543,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
              @in list_data_get: void_ptr; [[Function type]]
              @in dir: Efl.Ui.Focus.Direction; [[Focus direction]]
              @out next: Efl.Canvas.Object; [[Next object]]
-             @out next_item: Elm.Widget.Item; [[Next item]]
+             @out next_item: Efl.Ui.Widget; [[Next item]]
           }
        }
        focus_mouse_up_handle {
@@ -557,7 +557,7 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje
              @in base: const(Efl.Canvas.Object); [[Base]]
              @in degree: double; [[Degree]]
              @out direction: Efl.Canvas.Object; [[Direction]]
-             @out direction_item: Elm.Widget.Item; [[Direction item]]
+             @out direction_item: Efl.Ui.Widget; [[Direction item]]
              @out weight: double; [[Weight]]
           }
        }

diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index edc4e00..9edd8db 100644 (file)
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -851,21 +851,6 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac
             animate: bool; [[The enabled value for the highlight animation.]]
          }
       }
-      @property win_rotation @beta {
-         [[The rotation of this window
-
-           The value will automatically change when the WM of this window changes its rotation. This rotation is automatically applied to all @Efl.Ui.Layout objects.
-         ]]
-         set {
-          legacy: null;
-         }
-         get {
-          legacy: null;
-         }
-         values {
-           rotation : Efl.Orient; [[The rotation of the window]]
-         }
-      }
    }
    implements {
       class.constructor;

diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index f1d605a..4b192bf 100644 (file)
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -1560,7 +1560,7 @@ _elm_access_efl_access_component_highlight_grab(Eo *obj, void *pd EINA_UNUSED)
    if (!_access_action_callback_call(obj, ELM_ACCESS_ACTION_HIGHLIGHT, NULL))
      efl_access_component_highlight_grab(efl_super(obj, ELM_ACCESS_CLASS));
    else
-     efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_HIGHLIGHTED, EINA_TRUE);
+     efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_HIGHLIGHTED, EINA_TRUE);
 
    // TIZEN_ONLY(20160708) - support elm_access used for embedded toolkit
    action_by = ELM_ACCESS_ACTION_FIRST;
@@ -1575,7 +1575,7 @@ _elm_access_efl_access_component_highlight_clear(Eo *obj, void *pd EINA_UNUSED)
    if (!_access_action_callback_call(obj, ELM_ACCESS_ACTION_UNHIGHLIGHT, NULL))
      efl_access_component_highlight_clear(efl_super(obj, ELM_ACCESS_CLASS));
    else
-     efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_HIGHLIGHTED, EINA_FALSE);
+     efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_TYPE_HIGHLIGHTED, EINA_FALSE);
 
    // TIZEN_ONLY(20160708) - support elm_access used for embedded toolkit
    action_by = ELM_ACCESS_ACTION_FIRST;

diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index dcc59ca..2e02d64 100644 (file)
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -795,8 +795,6 @@ EAPI Eina_Bool        elm_widget_theme_element_set(Evas_Object *obj, const char
 EAPI const char      *elm_widget_theme_element_get(const Evas_Object *obj);
 EAPI Eina_Bool        elm_widget_theme_style_set(Evas_Object *obj, const char *name);
 EAPI const char      *elm_widget_theme_style_get(const Evas_Object *obj);
-<<<<<<< HEAD
-EAPI Efl_Ui_Theme_Apply_Result elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name);
 //TIZEN_ONLY(20160726): add API elm_object_part_access_object_get
 EAPI Evas_Object     *elm_widget_part_access_object_get(const Evas_Object *obj, const char *part);
 //
@@ -808,9 +806,7 @@ EAPI Eo*              _elm_atspi_bridge_utils_socket_create(Eo *parent, const ch
 EAPI Eina_Bool        _elm_widget_highlightable(Evas_Object *widget);
 EAPI Eina_Bool        _elm_widget_item_highlightable(Elm_Object_Item *item);
 //
-=======
-EAPI Eina_Error elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name);
->>>>>>> bb6caaa471... efl.ui: remove Efl.Ui.Theme_Apply_Error
+EAPI Eina_Error       elm_widget_element_update(Evas_Object *obj, Evas_Object *component, const char *name);
 
 /* debug function. don't use it unless you are tracking parenting issues */
 EAPI void             elm_widget_tree_dump(const Evas_Object *top);

diff --git a/src/lib/elementary_tizen/elc_ctxpopup.c b/src/lib/elementary_tizen/elc_ctxpopup.c
index b9bcb4f..d1f04cb 100644 (file)
--- a/src/lib/elementary_tizen/elc_ctxpopup.c
+++ b/src/lib/elementary_tizen/elc_ctxpopup.c
@@ -14,8 +14,8 @@
 
 #include "../elementary/elm_priv.h"
 #include "elm_widget_ctxpopup.h"
-#include "../elementary/elm_ctxpopup_item.eo.h"
-#include "../elementary/elm_ctxpopup.eo.h"
+#include "../elementary/elm_ctxpopup_item_eo.h"
+#include "../elementary/elm_ctxpopup_eo.h"
 
 #include "../elementary/elm_ctxpopup_part.eo.h"
 #include "../elementary/elm_part_helper.h"
@@ -1392,20 +1392,20 @@ _elm_ctxpopup_efl_ui_widget_event(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *s
 }
 
 //FIXME: lost the content size when theme hook is called.
-EOLIAN static Efl_Ui_Theme_Apply_Result
+EOLIAN static Eina_Error
 _elm_ctxpopup_efl_ui_widget_theme_apply(Eo *obj, Elm_Ctxpopup_Data *sd)
 {
    Eina_List *elist;
    Elm_Ctxpopup_Item_Data *item;
    int idx = 0;
    Eina_Bool rtl;
-   Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL;
+   Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
    const char *style;
 
-   ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL);
+   ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
 
    int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
-   if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL;
+   if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
 
    rtl = efl_ui_mirrored_get(obj);
 
@@ -2732,10 +2732,10 @@ _elm_ctxpopup_efl_access_object_state_set_get(const Eo *obj, Elm_Ctxpopup_Data *
    Efl_Access_State_Set ret;
    ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
 
-   STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
+   STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MODAL);
 
    if (_elm_object_accessibility_currently_highlighted_get() == (void*)sd->scr)
-     STATE_TYPE_SET(ret, EFL_ACCESS_STATE_HIGHLIGHTED);
+     STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_HIGHLIGHTED);
 
    return ret;
 }
@@ -3098,9 +3098,9 @@ _elm_ctxpopup_item_efl_access_object_state_set_get(const Eo *obj, Elm_Ctxpopup_I
      }
 
    if (is_showing)
-     STATE_TYPE_SET(states, EFL_ACCESS_STATE_SHOWING);
+     STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_SHOWING);
    else
-     STATE_TYPE_UNSET(states, EFL_ACCESS_STATE_SHOWING);
+     STATE_TYPE_UNSET(states, EFL_ACCESS_STATE_TYPE_SHOWING);
 
    return states;
 }
@@ -3125,5 +3125,5 @@ ELM_PART_OVERRIDE_CONTENT_UNSET(elm_ctxpopup, ELM_CTXPOPUP, Elm_Ctxpopup_Data)
    ELM_LAYOUT_SIZING_EVAL_OPS(elm_ctxpopup), \
    EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_ctxpopup)
 //
-#include "../elementary/elm_ctxpopup_item.eo.c"
-#include "../elementary/elm_ctxpopup.eo.c"
+#include "../elementary/elm_ctxpopup_item_eo.c"
+#include "../elementary/elm_ctxpopup_eo.c"

diff --git a/src/lib/elementary_tizen/elm_genlist.c b/src/lib/elementary_tizen/elm_genlist.c
index 453408f..7df03d4 100644 (file)
--- a/src/lib/elementary_tizen/elm_genlist.c
+++ b/src/lib/elementary_tizen/elm_genlist.c
@@ -19,11 +19,11 @@
 #include "../elementary/elm_priv.h"
 #include "elm_widget_genlist.h"
 #include "../elementary/elm_interface_scrollable.h"
-#include "../elementary/efl_ui_focus_parent_provider_gen.eo.h"
+#include "../elementary/efl_ui_focus_parent_provider_gen_eo.h"
 #include "../elementary/efl_ui_focus_composition_adapter.eo.h"
-#include "../elementary/elm_genlist_item.eo.h"
-#include "../elementary/elm_genlist_pan.eo.h"
-#include "../elementary/elm_genlist.eo.h"
+#include "../elementary/elm_genlist_item_eo.h"
+#include "../elementary/elm_genlist_pan_eo.h"
+#include "../elementary/elm_genlist_eo.h"
 
 #define MY_PAN_CLASS ELM_GENLIST_PAN_CLASS
 
@@ -927,10 +927,10 @@ _view_theme_update(Elm_Gen_Item *it, Evas_Object *view, const char *style)
 
    snprintf(buf, sizeof(buf), "item/%s", style ? : "default");
 
-   Efl_Ui_Theme_Apply_Result th_ret =
+   Eina_Error th_ret =
       elm_widget_theme_object_set(WIDGET(it), view, "genlist", buf,
                                   elm_widget_style_get(WIDGET(it)));
-   if (th_ret == EFL_UI_THEME_APPLY_RESULT_FAIL)
+   if (th_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC)
      {
         ERR("%s is not a valid genlist item style. "
             "Automatically falls back into default style.",
@@ -4642,15 +4642,15 @@ _mirrored_set(Evas_Object *obj,
    efl_ui_mirrored_set(obj, rtl);
 }
 
-EOLIAN static Efl_Ui_Theme_Apply_Result
+EOLIAN static Eina_Error
 _elm_genlist_efl_ui_widget_theme_apply(Eo *obj, Elm_Genlist_Data *sd)
 {
    Item_Block *itb;
-   Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL;
+   Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wsd, EFL_UI_THEME_APPLY_RESULT_FAIL);
 
    int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
-   if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL;
+   if (int_ret) return EFL_UI_THEME_APPLY_ERROR_GENERIC;
 
    if (!TIZEN_PROFILE_WEARABLE)
      _banded_bg_state_check(obj, sd);
@@ -9503,13 +9503,13 @@ _elm_genlist_efl_access_object_state_set_get(const Eo *obj, Elm_Genlist_Data *sd
 
    ret = efl_access_object_state_set_get(efl_super(obj, ELM_GENLIST_CLASS));
 
-   STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS);
+   STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MANAGES_DESCENDANTS);
 
    if (elm_genlist_multi_select_get(obj))
-     STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MULTISELECTABLE);
+     STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_MULTISELECTABLE);
 
    if (elm_genlist_reorder_mode_get(obj))
-     STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ANIMATED);
+     STATE_TYPE_SET(ret, EFL_ACCESS_STATE_TYPE_ANIMATED);
 
    return ret;
 }
@@ -9860,6 +9860,6 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_genlist, Elm_Genlist_Data)
 #define ELM_GENLIST_PAN_EXTRA_OPS \
    EFL_CANVAS_GROUP_DEL_OPS(elm_genlist_pan)
 
-#include "../elementary/elm_genlist.eo.c"
-#include "../elementary/elm_genlist_pan.eo.c"
-#include "../elementary/elm_genlist_item.eo.c"
+#include "../elementary/elm_genlist_eo.c"
+#include "../elementary/elm_genlist_pan_eo.c"
+#include "../elementary/elm_genlist_item_eo.c"

diff --git a/src/lib/elementary_tizen/elm_widget_ctxpopup.h b/src/lib/elementary_tizen/elm_widget_ctxpopup.h
index 9fc1c74..3ecf4be 100644 (file)
--- a/src/lib/elementary_tizen/elm_widget_ctxpopup.h
+++ b/src/lib/elementary_tizen/elm_widget_ctxpopup.h
@@ -95,7 +95,7 @@ struct _Elm_Ctxpopup_Data
   ELM_CTXPOPUP_DATA_GET(o, ptr);                     \
   if (EINA_UNLIKELY(!ptr))                           \
     {                                                \
-       CRI("No widget data for object %p (%s)",      \
+       ERR("No widget data for object %p (%s)",      \
            o, evas_object_type_get(o));              \
        return;                                       \
     }
@@ -104,7 +104,7 @@ struct _Elm_Ctxpopup_Data
   ELM_CTXPOPUP_DATA_GET(o, ptr);                         \
   if (EINA_UNLIKELY(!ptr))                               \
     {                                                    \
-       CRI("No widget data for object %p (%s)",          \
+       ERR("No widget data for object %p (%s)",          \
            o, evas_object_type_get(o));                  \
        return val;                                       \
     }

diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 0b0d8bc..5e5c1a8 100755 (executable)
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -676,6 +676,7 @@ struct _Image_Entry
    int                    server_id;
    int                    connect_num;
    int                    channel;
+   int                    num_palette;
    Evas_Load_Error        load_error;
 };