On Fri, 6 Jan 2012 09:57:37 +0900 Jihoon Kim <imfin...@gmail.com> said:
i'm not sure we can change the return value of this in edje due to it breaking abi... :/ ie expected return it USEd to give on error now changed. :/ > Yes, I know you made invalid again, > > That patch I've sent recent is for changing return value as 'NORMAL' > instead of 'invalid'. > elm_entry_input_panel_layout_get returns NORMAL as default return value. > I also think 'normal' is more appropriate default return value. > > On Thursday, January 5, 2012, Carsten Haitzler wrote: > > > On Wed, 4 Jan 2012 16:58:35 +0900 Jihoon Kim > > <imfin...@gmail.com<javascript:;>> said: > > > > i just made elm return invalid again > > > > > Raster, would you please change the return value as 'normal' of > > > ecore_imf_context_input_panel_layout_get and > > > edje_object_part_text_input_panel_layout_get like > > > elm_entry_input_panel_layout_get? > > > > > > I've attached the patch. > > > > > > Thanks. > > > > > > On Monday, January 2, 2012, Enlightenment SVN wrote: > > > > > > > Log: > > > > get rid of invalid panel layout and add hex and terminal. > > > > > > > > > > > > > > > > Author: raster > > > > Date: 2012-01-02 03:53:26 -0800 (Mon, 02 Jan 2012) > > > > New Revision: 66749 > > > > Trac: http://trac.enlightenment.org/e/changeset/66749 > > > > > > > > Modified: > > > > trunk/elementary/src/lib/elm_entry.c > > trunk/elementary/src/lib/elm_entry.h > > > > > > > > Modified: trunk/elementary/src/lib/elm_entry.c > > > > =================================================================== > > > > --- trunk/elementary/src/lib/elm_entry.c 2012-01-02 11:46:32 UTC > > > > (rev 66748) > > > > +++ trunk/elementary/src/lib/elm_entry.c 2012-01-02 11:53:26 UTC > > > > (rev 66749) > > > > @@ -3431,9 +3431,9 @@ > > > > EAPI Elm_Input_Panel_Layout > > > > elm_entry_input_panel_layout_get(Evas_Object *obj) > > > > { > > > > - ELM_CHECK_WIDTYPE(obj, widtype) ELM_INPUT_PANEL_LAYOUT_INVALID; > > > > + ELM_CHECK_WIDTYPE(obj, widtype) ELM_INPUT_PANEL_LAYOUT_NORMAL; > > > > Widget_Data *wd = elm_widget_data_get(obj); > > > > - if (!wd) return ELM_INPUT_PANEL_LAYOUT_INVALID; > > > > + if (!wd) return ELM_INPUT_PANEL_LAYOUT_NORMAL; > > > > > > > > return wd->input_panel_layout; > > > > } > > > > > > > > Modified: trunk/elementary/src/lib/elm_entry.h > > > > =================================================================== > > > > --- trunk/elementary/src/lib/elm_entry.h 2012-01-02 11:46:32 UTC > > > > (rev 66748) > > > > +++ trunk/elementary/src/lib/elm_entry.h 2012-01-02 11:53:26 UTC > > > > (rev 66749) > > > > @@ -26,8 +26,9 @@ > > > > ELM_INPUT_PANEL_LAYOUT_IP, /**< IP layout */ > > > > ELM_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */ > > > > ELM_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */ > > > > - ELM_INPUT_PANEL_LAYOUT_INVALID // XXX: remove this so we can expand > > > > -} Elm_Input_Panel_Layout; /**< Type of input panel (virtual keyboard) > > to > > > > use */ > > > > + ELM_INPUT_PANEL_LAYOUT_HEX, /**< Hexadecimal layout */ > > > > + ELM_INPUT_PANEL_LAYOUT_TERMINAL, /**< Command-line terminal layout > > */ > > > > +} Elm_Input_Panel_Layout; /**< Type of input panel (virtual keyboard) > > to > > > > use - this is a hint and may not provide exactly what is desired. */ > > > > > > > > typedef enum > > > > { > > > > @@ -871,8 +872,7 @@ > > > > * @param s The string (in markup) to be converted > > > > * @return The converted string (in UTF-8). It should be freed. > > > > */ > > > > -EAPI char *elm_entry_markup_to_utf8(const char *s) > > > > -EINA_MALLOC EINA_WARN_UNUSED_RESULT; > > > > +EAPI char *elm_entry_markup_to_utf8(const char *s); > > > > > > > > /** > > > > * This converts a UTF-8 string into markup (HTML-like). > > > > @@ -883,8 +883,7 @@ > > > > * @param s The string (in UTF-8) to be converted > > > > * @return The converted string (in markup). It should be freed. > > > > */ > > > > -EAPI char *elm_entry_utf8_to_markup(const char *s) > > > > -EINA_MALLOC EINA_WARN_UNUSED_RESULT; > > > > +EAPI char *elm_entry_utf8_to_markup(const char *s); > > > > > > > > /** > > > > * This sets the file (and implicitly loads it) for the text to > > display and > > > > @@ -1008,6 +1007,7 @@ > > > > * @param obj The scrolled entry object > > > > * @return the left widget insi> > > > enlightenment-...@lists.sourceforge.net <javascript:;> <javascript:;> > > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > > > > > > > > > -- > > ------------- Codito, ergo sum - "I code, therefore I am" -------------- > > The Rasterman (Carsten Haitzler) ras...@rasterman.com <javascript:;> > > > > -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ras...@rasterman.com ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
