On Wed, Feb 20, 2013 at 3:15 AM, Enlightenment SVN < [email protected]> wrote:
> Log: > edje: backport 61287fce389843c8cb1819556da08ec98241ca13. > > > Author: cedric > Date: 2013-02-19 19:15:25 -0800 (Tue, 19 Feb 2013) > New Revision: 84251 > Trac: http://trac.enlightenment.org/e/changeset/84251 > > Modified: > branches/edje-1.7/ChangeLog branches/edje-1.7/NEWS > branches/edje-1.7/src/lib/edje_cache.c branches/edje-1.7/src/lib/edje_text.c > > Modified: branches/edje-1.7/ChangeLog > =================================================================== > --- branches/edje-1.7/ChangeLog 2013-02-20 03:08:44 UTC (rev 84250) > +++ branches/edje-1.7/ChangeLog 2013-02-20 03:15:25 UTC (rev 84251) > @@ -664,7 +664,7 @@ > > * Fix cache miss bug when edje cache hash is null, but cache > list may have entries. > - > + > 2013-02-07 WooHyun Jung. > > * Backport from r83700 in trunk. Checking walking_callbacks for > not removing patterns which are still used. > @@ -681,3 +681,7 @@ > 2013-02-18 Jihoon Kim (jihoon) > > * edje entry : Fix bug candidate word couldn't be selected with > up/down key in the preedit status > + > +2013-02-20 Cedric Bail > + > + * report file not found properly. > > Modified: branches/edje-1.7/NEWS > =================================================================== > --- branches/edje-1.7/NEWS 2013-02-20 03:08:44 UTC (rev 84250) > +++ branches/edje-1.7/NEWS 2013-02-20 03:15:25 UTC (rev 84251) > @@ -9,6 +9,7 @@ > * fix anchor clicked mouse signals for selection-enabled entries > * Fix edje_color_class_list() and edje_text_class_list() to look at > right hashes. > * Fix bug candidate word couldn't be selected with up/down key in the > preedit status > + * Report file not found properly. > > Changes since Edje 1.7.4: > ------------------------- > > Modified: branches/edje-1.7/src/lib/edje_cache.c > =================================================================== > --- branches/edje-1.7/src/lib/edje_cache.c 2013-02-20 03:08:44 UTC > (rev 84250) > +++ branches/edje-1.7/src/lib/edje_cache.c 2013-02-20 03:15:25 UTC > (rev 84251) > @@ -275,7 +275,10 @@ > struct stat st; > > if (stat(file, &st) != 0) > - return NULL; > + { > + *error_ret = EDJE_LOAD_ERROR_DOES_NOT_EXIST; > + return NULL; > + } > > if (!_edje_file_hash) > { > > Modified: branches/edje-1.7/src/lib/edje_text.c > =================================================================== > --- branches/edje-1.7/src/lib/edje_text.c 2013-02-20 03:08:44 UTC > (rev 84250) > +++ branches/edje-1.7/src/lib/edje_text.c 2013-02-20 03:15:25 UTC > (rev 84251) > @@ -77,52 +77,12 @@ > } > } > > -static void > -_edje_text_fit_set(char *buf, const char *text, int c1, int c2) > -{ > - /* helper function called from _edje_text_fit_x(). > - * note that we can use strcpy()/strcat() safely, the buffer lengths > - * are checked in the caller. > - */ > - > - if (c1 >= 0) > - { > - strcpy(buf, _ELLIP_STR); > - > - if (c2 >= 0) > - { > - strncat(buf, text + c1, c2 - c1); > - strcat(buf, _ELLIP_STR); > - } > - else > - strcat(buf, text + c1); > - } > - else > - { > - if (c2 >= 0) > - { > - strncpy(buf, text, c2); > - buf[c2] = 0; > - strcat(buf, _ELLIP_STR); > - } > - else > - strcpy(buf, text); > - } > -} > - > static const char * > _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep, > Edje_Calc_Params *params, > const char *text, const char *font, int size, > - Evas_Coord sw, int *free_text) > + Evas_Coord sw, Evas_Coord sh, int *free_text) > { > - Evas_Coord tw = 0, th = 0, p; > - int l, r; > - int i; > - char *buf; > - int uc1 = -1, uc2 = -1, c1 = -1, c2 = -1; > - int loop = 0, extra; > - size_t orig_len; > FLOAT_T sc; > > sc = ed->scale; > @@ -132,149 +92,12 @@ > if (sw <= 1) return ""; > > if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); > + evas_object_text_ellipsis_set(ep->object, params->type.text.elipsis); > this is an evas 1.8 function. you broke build. ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
