summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Hirt <daniel.hirt@samsung.com>2016-06-30 11:32:02 +0000
committerDaniel Hirt <daniel.hirt@samsung.com>2016-06-30 11:32:02 +0000
commitee36fdc2183a3de9569cac5ae74c0fb30d3d76db (patch)
tree44c5e9fd8dd930af705c004e423c982c48ef969a /src
parente0cda40515cac1d8fd0ef70c91229fb2d499e045 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_entry.eo4
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)
4373 (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN); 4373 (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
4374} 4374}
4375 4375
4376EOLIAN static const char* 4376EOLIAN static char*
4377_elm_entry_cursor_content_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) 4377_elm_entry_cursor_content_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
4378{ 4378{
4379 return edje_object_part_text_cursor_content_get 4379 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,
628 Only the text is returned, any format that may exist will not be part 628 Only the text is returned, any format that may exist will not be part
629 of the return value. You must free the string when done with \@ref free. 629 of the return value. You must free the string when done with \@ref free.
630 ]] 630 ]]
631 return: own(string) @warn_unused; 631 return: own(char *) @warn_unused;
632 } 632 }
633 } 633 }
634 @property selection { 634 @property selection {
@@ -803,7 +803,7 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
803 input_panel_imdata_get @const { 803 input_panel_imdata_get @const {
804 [[Get the specific data of the current input panel.]] 804 [[Get the specific data of the current input panel.]]
805 params { 805 params {
806 @in data: void_ptr; [[The specific data to be got from the input panel.]] 806 @out data: void; [[The specific data to be got from the input panel.]]
807 @out len: int; [[The length of data.]] 807 @out len: int; [[The length of data.]]
808 } 808 }
809 } 809 }