herdsman pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ee36fdc2183a3de9569cac5ae74c0fb30d3d76db

commit ee36fdc2183a3de9569cac5ae74c0fb30d3d76db
Author: Daniel Hirt <daniel.h...@samsung.com>
Date:   Thu Jun 30 11:32:02 2016 +0000

    Revert "elm: Fix wrong use of char instead of string and void out parameter"
    
    This reverts commit 61f52a26fb5a512e77d3141e398182107b1cf752.
    
    This fixes the reported break on T4000.
---
 src/lib/elementary/elm_entry.c  | 2 +-
 src/lib/elementary/elm_entry.eo | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 16b1c43..4b1922a 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -4373,7 +4373,7 @@ _elm_entry_cursor_is_visible_format_get(Eo *obj 
EINA_UNUSED, Elm_Entry_Data *sd)
             (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
 }
 
-EOLIAN static const char*
+EOLIAN static char*
 _elm_entry_cursor_content_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
 {
    return edje_object_part_text_cursor_content_get
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 9e362ba..d9c6856 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -628,7 +628,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, 
Efl.Ui.Clickable,
               Only the text is returned, any format that may exist will not be 
part
               of the return value. You must free the string when done with 
\@ref free.
             ]]
-            return: own(string) @warn_unused;
+            return: own(char *) @warn_unused;
          }
       }
       @property selection {
@@ -803,7 +803,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, 
Efl.Ui.Clickable,
       input_panel_imdata_get @const {
          [[Get the specific data of the current input panel.]]
          params {
-            @in data: void_ptr; [[The specific data to be got from the input 
panel.]]
+            @out data: void; [[The specific data to be got from the input 
panel.]]
             @out len: int; [[The length of data.]]
          }
       }

-- 


Reply via email to