E CVS: apps/ephoto ravenlock
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: ephoto_main.c Log Message: warnings-- === RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- ephoto_main.c 14 Sep 2007 18:23:38 - 1.46 +++ ephoto_main.c 3 Nov 2007 03:02:40 - 1.47 @@ -40,7 +40,7 @@ void create_main(void) { char buf[PATH_MAX]; - Ewl_Widget *vbox, *hbox, *vsep, *button; + Ewl_Widget *vbox, *vsep, *button; Ewl_Widget *mb, *menu, *mi; /*Initialize our main Structure*/ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: cpu ravenlock
Enlightenment CVS committal Author : ravenlock Project : e_modules Module : cpu Dir : e_modules/cpu Modified Files: e_mod_main.c Log Message: warnings-- === RCS file: /cvs/e/e_modules/cpu/e_mod_main.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- e_mod_main.c31 Oct 2007 12:32:24 - 1.42 +++ e_mod_main.c3 Nov 2007 03:01:30 - 1.43 @@ -237,13 +237,14 @@ static int _get_cpu_count(void) { - FILE *f; - char tmp[4]; int cpu = -1; #ifdef __FreeBSD__ cpu = 1; #else + FILE *f; + char tmp[4]; + if (!(f = fopen("/proc/stat", "r"))) return cpu; while (fscanf(f, "cp%s %*u %*u %*u %*u %*u %*u %*u %*u\n", (char *) &tmp) == 1) - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edb ravenlock
Enlightenment CVS committal Author : ravenlock Project : e17 Module : libs/edb Dir : e17/libs/edb/tools Modified Files: edb_vt_ed.c Log Message: fix compiler warnings === RCS file: /cvs/e/e17/libs/edb/tools/edb_vt_ed.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- edb_vt_ed.c 26 Aug 2007 22:19:36 - 1.5 +++ edb_vt_ed.c 3 Nov 2007 02:59:02 - 1.6 @@ -49,10 +49,6 @@ main(int argc, char **argv) { int i; - int nocmb = 10; - int nocmb2 = 1239712310; - float flt = 10.40; - char *dbfile = NULL; for(i=1; i < argc; i++) - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk moom
Enlightenment CVS committal Author : moom Project : e17 Module : libs/etk Dir : e17/libs/etk/src/lib Modified Files: etk_textblock2.c Log Message: * [Textblock2] More work on the rendering code === RCS file: /cvs/e/e17/libs/etk/src/lib/etk_textblock2.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- etk_textblock2.c2 Nov 2007 14:32:23 - 1.3 +++ etk_textblock2.c2 Nov 2007 22:13:58 - 1.4 @@ -9,7 +9,6 @@ #include #include -#include #include "etk_string.h" #include "etk_utils.h" @@ -29,13 +28,15 @@ Etk_Textblock2_Iter *cursor; Etk_Textblock2_Iter *selection; Etk_TB2_Object_Line *lines; + Etk_TB2_Object_Line *first_visible; Evas_Textblock_Style *style; Evas_Object *clip; - Ecore_Job *update_job; + Ecore_Timer *update_timer; int xoffset; int yoffset; + int first_visible_offset; }; /* A line of a textblock-object */ @@ -77,7 +78,7 @@ static void _etk_tb2_object_line_remove(Evas_Object *tbo, Etk_Textblock2_Line *line); static void _etk_tb2_object_line_update_queue(Evas_Object *tbo, Etk_Textblock2_Line *line, Etk_Bool update_content, Etk_Bool update_geometry); static void _etk_tb2_object_update_queue(Evas_Object *tbo); -static void _etk_tb2_object_update(void *obj); +static int _etk_tb2_object_update(void *obj); static Evas_Object *_etk_tb2_object_line_object_add(Evas_Object *tbo); static void _etk_tb2_object_line_object_build(Evas_Object *lo, Etk_Textblock2_Line *line); @@ -1727,6 +1728,12 @@ if (line->object_lines == object_line) line->object_lines = object_line->fellow_next; + if (sd->first_visible == object_line) + { + sd->first_visible = sd->lines; + sd->first_visible_offset = 0; + } + if (object_line->object) evas_object_del(object_line->object); free(object_line); @@ -1760,12 +1767,12 @@ if (!tbo || !(sd = evas_object_smart_data_get(tbo))) return; - if (!sd->update_job) - sd->update_job = ecore_job_add(_etk_tb2_object_update, tbo); + if (!sd->update_timer) + sd->update_timer = ecore_timer_add(0.0, _etk_tb2_object_update, tbo); } /* Update the given textblock-object */ -static void _etk_tb2_object_update(void *obj) +static int _etk_tb2_object_update(void *obj) { Evas_Object *tbo; Etk_TB2_Object_SD *sd; @@ -1773,29 +1780,37 @@ Evas_Object *line_obj; int x, y, w, h; int tb_w, tb_h, native_w, native_h; + int num_wrapped, num_lines, num_updated, num_visible; Etk_Bool visible; - int num_wrapped, num_lines, num_updates, num_visible; + double start_time, time; if (!(tbo = obj) || !(sd = evas_object_smart_data_get(tbo))) - return; + return 0; + + if (sd->update_timer) + ecore_timer_del(sd->update_timer); + sd->update_timer = NULL; - printf("Update Job\n"); - sd->update_job = NULL; evas_object_geometry_get(tbo, &x, &y, &w, &h); if (w == 0 || h == 0) - return; + return 0; w = ETK_MAX(w, 100); tb_w = 0; tb_h = 0; - line_obj = NULL; - num_wrapped = 0; num_lines = 0; - num_updates = 0; + num_updated = 0; num_visible = 0; + line_obj = NULL; + start_time = ecore_time_get(); + time = start_time; + for (line = sd->lines; line; line = line->next) { + if (time - start_time > 0.03 && num_updated > 20) + break; + /* Update the geometry of the object-line if needed */ if (line->need_geometry_update) { @@ -1813,11 +1828,11 @@ else if (line->need_content_update) _etk_tb2_object_line_object_build(line->object, line->line); - num_updates++; evas_object_resize(line->object, w, 300); evas_object_textblock_size_native_get(line->object, &native_w, &native_h); evas_object_textblock_size_formatted_get(line->object, &line->size.w, &line->size.h); - line->wrapped = (native_w != line->size.w || native_h != line->size.h); + line->wrapped = (native_h != line->size.h); + num_updated++; } /* Now, render the line-object if the line is visible, or delete it otherwise */ @@ -1853,12 +1868,29 @@ if (line->wrapped) num_wrapped++; num_lines++; + + time = ecore_time_get(); + } + + if (line) + { + for ( ; line; line = line->next) + { + if (line->object) + { +evas_object_del(line->object); +line->object = NULL; + } + } + _etk_tb2_object_update_queue(tbo); } if (line_obj) evas_object_del(line_obj); - printf("Nb lines: %d | Updated: %d | Wrapped: %d | V
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/msgbus_lang Modified Files: module.desktop.in Log Message: DBus module goes into System. Change .desktop to reflect module type. === RCS file: /cvs/e/e17/apps/e/src/modules/msgbus_lang/module.desktop.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- module.desktop.in 6 Oct 2007 19:00:37 - 1.2 +++ module.desktop.in 2 Nov 2007 21:37:39 - 1.3 @@ -3,3 +3,4 @@ Name=DBus Extension - Language Name[it]=Estensione DBus - Lingua Icon=e-module-msgbus_lang +X-Enlightenment-ModuleType=system - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_modules.c Log Message: Much better modules dialog. Faster at listing, loading & unloading modules. Separates modules into sorted categories. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- e_int_config_modules.c 2 Nov 2007 07:00:17 - 1.78 +++ e_int_config_modules.c 2 Nov 2007 21:41:06 - 1.79 @@ -3,63 +3,97 @@ */ #include "e.h" -typedef struct _CFModule +typedef struct _CFModule CFModule; +typedef struct _CFType CFType; +typedef struct _CFTypes CFTypes; + +struct _CFModule { const char *short_name, *name, *comment; const char *icon, *orig_path, *type; int enabled, selected; -} CFModule; +}; + +struct _CFType +{ + const char *key, *name; + Evas_Hash *modules; +}; + +struct _CFTypes +{ + const char *key, *name; +}; -struct _E_Config_Dialog_Data +struct _E_Config_Dialog_Data { - Evas_Object *o_avail, *o_loaded; + Evas_Object *l_avail, *l_loaded; Evas_Object *b_load, *b_unload; Evas_Object *o_desc; }; -static void*_create_data (E_Config_Dialog *cfd); -static void _fill_data(E_Config_Dialog_Data *cfdata); -static void _free_data(E_Config_Dialog *cfd, - E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create (E_Config_Dialog *cfd, Evas *evas, - E_Config_Dialog_Data *cfdata); - -/* Private Function Protos */ -static void _load_modules (const char *dir); -static int _modules_list_cb_sort (void *data1, void *data2); -static void _fill_avail_list (E_Config_Dialog_Data *cfdata); -static void _fill_loaded_list (E_Config_Dialog_Data *cfdata); -static void _avail_list_cb_change (void *data, Evas_Object *obj); -static void _loaded_list_cb_change (void *data, Evas_Object *obj); -static void _btn_cb_unload (void *data, void *data2); -static void _btn_cb_load (void *data, void *data2); -static int _upd_hdl_cb(void *data, int type, void *event); -static void _fill_list (Evas_Object *obj, const char *type, int enabled); -static int _find_module_category (const char *type, int enabled); - -/* Hash callback Protos */ -static Evas_Bool _modules_hash_cb_free (Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, - void *data, void *fdata __UNUSED__); -static Evas_Bool _modules_hash_cb_unsel (Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, - void *data, void *fdata __UNUSED__); -static Evas_Bool _modules_hash_cb_load (Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, - void *data, void *fdata __UNUSED__); -static Evas_Bool _modules_hash_cb_unload (Evas_Hash *hash __UNUSED__, - const char *key __UNUSED__, - void *data, void *fdata __UNUSED__); - -static Evas_Hash *modules = NULL; -static Evas_List *modules_list = NULL; -Ecore_Event_Handler *upd_hdl = NULL; +/* Key pairs for module types + * + * Should be in alphabetic order */ +const CFTypes _types[] = +{ + {"appearance", N_("Appearance")}, + {"config", N_("Configuration")}, + {"fileman",N_("File Manager")}, + {"shelf", N_("Shelf")}, + {"system", N_("System")}, + {NULL, NULL} +}; + +/* local function protos */ +static void*_create_data (E_Config_Dialog *cfd); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd, + E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create (E_Config_Dialog *cfd, Evas *evas, + E_Config_Dialog_Data *cfdata); +static void _fill_type_hash (void); +static void _load_modules (const char *dir); +static void _fill_list(Evas_Object *obj, int enabled); +static Evas_Bool_types_hash_cb_free (Evas_Hash *hash __UNUSED__, + const char *key __UNUSED__, + void *data, void *fdata __UNUSED__); +static Evas_Bool_mod_hash_cb_free (Evas_Hash *hash __UNUSED__, + const char *key __UNUSED__, + void *data, void *fdata __UNUSED__); +static Evas_Bool_mod_hash_avail_list (Evas_Hash *hash __UNUSED__, +
E CVS: alarm devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : alarm Dir : e_modules/alarm Modified Files: module.desktop.in Log Message: Fix alarm module icon in .desktop === RCS file: /cvs/e/e_modules/alarm/module.desktop.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- module.desktop.in 26 Aug 2007 04:12:47 - 1.4 +++ module.desktop.in 2 Nov 2007 21:28:48 - 1.5 @@ -5,5 +5,5 @@ StartupNotify=false X-Enlightenment-WaitExit=false X-Enlightenment-IconClass=alarm,gadget -Icon=./module.edj +Icon=module Comment=Alarm ModuleA module which allows you toset popup reminders. - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/engrave englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/engrave Dir : e17/libs/engrave/src/lib Modified Files: engrave.y Log Message: IMAGE was defined twice. === RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave.y,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- engrave.y 21 Aug 2007 05:42:29 - 1.30 +++ engrave.y 2 Nov 2007 14:47:31 - 1.31 @@ -45,7 +45,7 @@ %token STYLES STYLE SBASE TAG ELIPSIS PRECISE_IS_INSIDE %token COLON QUOTE SEMICOLON STATE_SET ACTION_STOP SIGNAL_EMIT %token DRAG_VAL_SET DRAG_VAL_STEP DRAG_VAL_PAGE LINEAR -%token SINUSOIDAL ACCELERATE DECELERATE IMAGE RECT SWALLOW GRADIENT TGROUP +%token SINUSOIDAL ACCELERATE DECELERATE RECT SWALLOW GRADIENT TGROUP %token NONE PLAIN OUTLINE SOFT_OUTLINE SHADOW SOFT_SHADOW FAR_SHADOW FAR_SOFT_SHADOW GLOW %token OUTLINE_SHADOW OUTLINE_SOFT_SHADOW VERTICAL HORIZONTAL BOTH %token SPECTRA SPECTRUM GRAD POINTER_MODE NOGRAB AUTOGRAB - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk moom
Enlightenment CVS committal Author : moom Project : e17 Module : libs/etk Dir : e17/libs/etk/src/lib Modified Files: etk_textblock2.c Log Message: * [Textblock2] It can now render simple texts. Still not usable though.. === RCS file: /cvs/e/e17/libs/etk/src/lib/etk_textblock2.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- etk_textblock2.c2 Nov 2007 13:05:21 - 1.2 +++ etk_textblock2.c2 Nov 2007 14:32:23 - 1.3 @@ -1669,6 +1669,8 @@ object_line->tbo = tbo; object_line->line = line; object_line->object = NULL; + object_line->size.w = 0; + object_line->size.h = 0; object_line->need_content_update = ETK_TRUE; object_line->need_geometry_update = ETK_TRUE; object_line->wrapped = ETK_FALSE; @@ -1745,7 +1747,7 @@ if ((object_line = _etk_tb2_object_line_get(tbo, line))) { object_line->need_content_update |= update_content; - object_line->need_geometry_update |= update_geometry; + object_line->need_geometry_update |= (update_geometry || update_content); _etk_tb2_object_update_queue(tbo); } } @@ -1768,9 +1770,11 @@ Evas_Object *tbo; Etk_TB2_Object_SD *sd; Etk_TB2_Object_Line *line; - Evas_List *unused_line_objects, *l; Evas_Object *line_obj; - int x, y, w, h, lw, lh, nw, nh; + int x, y, w, h; + int tb_w, tb_h, native_w, native_h; + Etk_Bool visible; + int num_wrapped, num_lines, num_updates, num_visible; if (!(tbo = obj) || !(sd = evas_object_smart_data_get(tbo))) return; @@ -1780,75 +1784,81 @@ evas_object_geometry_get(tbo, &x, &y, &w, &h); if (w == 0 || h == 0) return; - w = ETK_MIN(w, 100); + w = ETK_MAX(w, 100); + tb_w = 0; + tb_h = 0; + line_obj = NULL; + + num_wrapped = 0; + num_lines = 0; + num_updates = 0; + num_visible = 0; for (line = sd->lines; line; line = line->next) { - } - -#if 0 - - /* Retrieve the line-objects that are unused or that need content-update -* and store them into "unused_line_objects" */ - unused_line_objects = NULL; - /*for (l = sd->line_objects; l; l = l->next) - { - line_obj = l->data; - if (!(line = evas_object_data_get(line_obj, "_Etk_Textblock2::Line")) || line->need_content_update) + /* Update the geometry of the object-line if needed */ + if (line->need_geometry_update) { - if (line) + if (!line->object) { -evas_object_data_set(line_obj, "_Etk_Textblock2::Line", NULL); -line->object = NULL; +if (line_obj) +{ + line->object = line_obj; + line_obj = NULL; +} +else + line->object = _etk_tb2_object_line_object_add(tbo); +_etk_tb2_object_line_object_build(line->object, line->line); } - unused_line_objects = evas_list_append(unused_line_objects, line_obj); + else if (line->need_content_update) +_etk_tb2_object_line_object_build(line->object, line->line); + + num_updates++; + evas_object_resize(line->object, w, 300); + evas_object_textblock_size_native_get(line->object, &native_w, &native_h); + evas_object_textblock_size_formatted_get(line->object, &line->size.w, &line->size.h); + line->wrapped = (native_w != line->size.w || native_h != line->size.h); } - }*/ - - lw = 0; - lh = 0; - line_obj = _etk_tb2_object_line_object_add(tbo); - for (line = sd->lines; line; line = line->next) - { - if (1 || line->need_geometry_update || line->need_content_update || !line->object) + + /* Now, render the line-object if the line is visible, or delete it otherwise */ + visible = ((tb_h <= (sd->yoffset + h)) && ((tb_h + line->size.h) >= sd->yoffset)); + if (visible) { - if (1 || !line->object || line->need_content_update) + if (!line->object) { -/*if (!line->object) -{ - if (unused_line_objects) - { - line->object = unused_line_objects->data; - unused_line_objects = evas_list_remove_list(unused_line_objects, unused_line_objects); - } - else - line->object = _etk_tb2_object_line_object_add(tbo); - evas_object_data_set(line->object, "_Etk_Textblock2::Line", line); -}*/ -line->object = line_obj; +line->object = _etk_tb2_object_line_object_add(tbo); _etk_tb2_object_line_object_build(line->object, line->line); - -evas_object_move(line->object, x, y + lh); -evas_object_resize(line->object, ETK_MAX(w, 50), 100); -evas_object_show(line->object); -//evas_object_textblock_size_native_get(line->ob
E CVS: libs/etk moom
Enlightenment CVS committal Author : moom Project : e17 Module : libs/etk Dir : e17/libs/etk/src/lib Modified Files: etk_string.c etk_textblock2.c etk_textblock2.h Log Message: * [Textblock2] More work. Still not usable! === RCS file: /cvs/e/e17/libs/etk/src/lib/etk_string.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- etk_string.c31 Oct 2007 18:46:16 - 1.20 +++ etk_string.c2 Nov 2007 13:05:21 - 1.21 @@ -18,7 +18,7 @@ #define BLOCK_SIZE 128 #define SIZE_TO_ALLOC(length) \ - (((length) + (BLOCK_SIZE - 1)) / BLOCK_SIZE) * BLOCK_SIZE + (((length) + (BLOCK_SIZE - 1)) / BLOCK_SIZE) * BLOCK_SIZE enum _Etk_String_Property_Id { === RCS file: /cvs/e/e17/libs/etk/src/lib/etk_textblock2.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_textblock2.c31 Oct 2007 11:04:58 - 1.1 +++ etk_textblock2.c2 Nov 2007 13:05:21 - 1.2 @@ -31,8 +31,8 @@ Etk_TB2_Object_Line *lines; Evas_Textblock_Style *style; - Evas_List *line_objects; - Evas_List *unused_line_objects; + Evas_Object *clip; + Ecore_Job *update_job; int xoffset; int yoffset; @@ -43,19 +43,24 @@ { Etk_TB2_Object_Line *prev; Etk_TB2_Object_Line *next; + Etk_TB2_Object_Line *fellow_prev; + Etk_TB2_Object_Line *fellow_next; Etk_Textblock2_Line *line; + Evas_Object *tbo; Evas_Object *object; + Etk_Size size; Etk_Bool need_content_update : 1; Etk_Bool need_geometry_update : 1; + Etk_Bool wrapped : 1; }; static void _etk_tb2_constructor(Etk_Textblock2 *tb); static void _etk_tb2_destructor(Etk_Textblock2 *tb); -static Etk_Textblock2_Paragraph *_etk_tb2_paragraph_create(Etk_Textblock2 *tb, Etk_Textblock2_Paragraph *prev); -static Etk_Textblock2_Line *_etk_tb2_line_create(Etk_Textblock2_Paragraph *paragraph, Etk_Textblock2_Line *prev); +static Etk_Textblock2_Paragraph *_etk_tb2_paragraph_create(Etk_Textblock2 *tb, Etk_Textblock2_Paragraph *prev, Etk_Bool create_line); +static Etk_Textblock2_Line *_etk_tb2_line_create(Etk_Textblock2_Paragraph *paragraph, Etk_Textblock2_Line *prev, Etk_Bool create_node); static Etk_Textblock2_Node *_etk_tb2_node_create(Etk_Textblock2_Line *line, Etk_Textblock2_Node *prev); static void _etk_tb2_paragraph_free(Etk_Textblock2_Paragraph *paragraph); static void _etk_tb2_line_free(Etk_Textblock2_Line *line); @@ -67,8 +72,13 @@ static Etk_Bool _etk_tb2_iter_is_valid(Etk_Textblock2_Iter *iter); static void _etk_tb2_iter_reorder(Etk_Textblock2_Iter *iter, Etk_Textblock2_Iter *prev); -static void _etk_tb2_object_update(Evas_Object *tbo); -static Evas_Object *_etk_tb2_object_line_object_add(Evas_Object *tbo); +static Etk_TB2_Object_Line *_etk_tb2_object_line_get(Evas_Object *tbo, Etk_Textblock2_Line *line); +static void _etk_tb2_object_line_add(Evas_Object *tbo, Etk_Textblock2_Line *line); +static void _etk_tb2_object_line_remove(Evas_Object *tbo, Etk_Textblock2_Line *line); +static void _etk_tb2_object_line_update_queue(Evas_Object *tbo, Etk_Textblock2_Line *line, Etk_Bool update_content, Etk_Bool update_geometry); +static void _etk_tb2_object_update_queue(Evas_Object *tbo); +static void _etk_tb2_object_update(void *obj); +static Evas_Object *_etk_tb2_object_line_object_add(Evas_Object *tbo); static void _etk_tb2_object_line_object_build(Evas_Object *lo, Etk_Textblock2_Line *line); static void _etk_tb2_object_smart_add(Evas_Object *tbo); @@ -77,6 +87,9 @@ static void _etk_tb2_object_smart_resize(Evas_Object *tbo, Evas_Coord w, Evas_Coord h); static void _etk_tb2_object_smart_show(Evas_Object *tbo); static void _etk_tb2_object_smart_hide(Evas_Object *tbo); +static void _etk_tb2_object_smart_color_set(Evas_Object *tbo, int r, int g, int b, int a); +static void _etk_tb2_object_smart_clip_set(Evas_Object *tbo, Evas_Object *clip); +static void _etk_tb2_object_smart_clip_unset(Evas_Object *tbo); static const char *_escape_sequences[] = { @@ -129,9 +142,8 @@ * @param text the text to set * @param markup whether or not you want to apply markup and styling on the text. * If @a markup is ETK_TRUE, you can use tags to format the text. - * @note After that, all the iterators will be at the end of the textblock + * @note After this operation, all the iterators will be at the start of the textb
E CVS: moon englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : moon Dir : e_modules/moon/src Modified Files: e_mod_main.c e_mod_main.h Log Message: Remove deprecated functions. === RCS file: /cvs/e/e_modules/moon/src/e_mod_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_main.c16 Sep 2007 03:31:41 - 1.10 +++ e_mod_main.c2 Nov 2007 12:22:16 - 1.11 @@ -119,20 +119,6 @@ return 1; } -EAPI int -e_modapi_about(E_Module *module) -{ - char title[1024]; - - snprintf(title, sizeof(title), "%s %s", D_("Moon Clock Module"), -PACKAGE_VERSION); - e_module_dialog_show(module, title, -D_("Display current phase of the moon ala e16 E-MoonClock")); - return 1; -} - - - static E_Gadcon_Client * _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) { === RCS file: /cvs/e/e_modules/moon/src/e_mod_main.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.h3 Jul 2006 17:37:08 - 1.3 +++ e_mod_main.h2 Nov 2007 12:22:16 - 1.4 @@ -32,7 +32,6 @@ EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_about(E_Module *m); EAPI int e_modapi_save (E_Module *m); void moon_config_init(E_Module *m); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: penguins englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : penguins Dir : e_modules/penguins Modified Files: e_mod_main.c e_mod_main.h Log Message: Remove deprecated functions. === RCS file: /cvs/e/e_modules/penguins/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c20 Oct 2007 13:14:50 - 1.1 +++ e_mod_main.c2 Nov 2007 12:22:16 - 1.2 @@ -78,42 +78,6 @@ return 1; } -EAPI int -e_modapi_about(E_Module *m) -{ - e_module_dialog_show(m, D_("Enlightenment Penguins Module"), -D_ -("This is a module to display fancy penguins on your desktop.and you can choose the population you like")); - return 1; -} - -EAPI int -e_modapi_config(E_Module *m) -{ - Population *pop; - E_Container *con; - Evas_List *l; - - pop = m->data; - if (!pop) - return 0; - if (!pop->cons) - return 0; - con = e_container_current_get(e_manager_current_get()); - for (l = pop->cons; l; l = l->next) - { -E_Container *c; - -c = l->data; -if (c == con) - { - _config_penguin_module(con, pop); - break; - } - } - return 1; -} - /* module private routines */ static Population * _population_init(E_Module *m) === RCS file: /cvs/e/e_modules/penguins/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h20 Oct 2007 13:14:50 - 1.1 +++ e_mod_main.h2 Nov 2007 12:22:16 - 1.2 @@ -84,8 +84,6 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -EAPI int e_modapi_about(E_Module *m); -EAPI int e_modapi_config(E_Module *m); void _penguins_cb_config_updated(void *data); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: alarm englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : alarm Dir : e_modules/alarm Modified Files: e_mod_main.c e_mod_main.h Log Message: Remove deprecated functions. === RCS file: /cvs/e/e_modules/alarm/e_mod_main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.c16 Sep 2007 03:31:40 - 1.7 +++ e_mod_main.c2 Nov 2007 12:22:16 - 1.8 @@ -1166,22 +1166,3 @@ e_config_domain_save("module.alarm", _conf_edd, alarm_config); return 1; } - -EAPI int -e_modapi_about(E_Module *m) -{ - e_module_dialog_show(m, D_("Alarm Module version " MODULE_VERSION), - D_("An alarm clock module" - "http://.zapto.org" - "[EMAIL PROTECTED]")); - return 1; -} - -EAPI int -e_modapi_config(E_Module *m) -{ - if (!alarm_config) return 0; - if (alarm_config->config_dialog) return 0; - alarm_config_module(); - return 1; -} === RCS file: /cvs/e/e_modules/alarm/e_mod_main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.h31 Jan 2007 15:34:13 - 1.2 +++ e_mod_main.h2 Nov 2007 12:22:16 - 1.3 @@ -143,8 +143,6 @@ EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); EAPI int e_modapi_save (E_Module *m); -EAPI int e_modapi_about(E_Module *m); -EAPI int e_modapi_config (E_Module *m); Alarm *alarm_alarm_add(int state, char *name, int type, char *date, int day_monday, int day_tuesday, int day_wenesday, int day_thursday, int day_friday, int day_saturday, int day_sunday, int hour, int minute, int autoremove, char *description, int open_popup, int run_program, char *program, int *error); void alarm_alarm_del(Alarm *al); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: news englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : news Dir : e_modules/news/src/module Modified Files: e_mod_main.c e_mod_main.h Log Message: Remove deprecated functions. === RCS file: /cvs/e/e_modules/news/src/module/e_mod_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.c16 Sep 2007 03:31:41 - 1.6 +++ e_mod_main.c2 Nov 2007 12:22:16 - 1.7 @@ -99,28 +99,6 @@ return ret; } -EAPI int -e_modapi_about(E_Module *m) -{ - news_util_message_show(_("Module to display information feeds" -"like Rss (and soon Atom), on youre desktop" -"[EMAIL PROTECTED]" -"http://.zapto.org";)); - return 1; -} - -EAPI int -e_modapi_config(E_Module *m) -{ - int ret; - - if (!news) return 0; - ret = news_config_dialog_show(); - - return ret; -} - - /* * Gadcon functions */ === RCS file: /cvs/e/e_modules/news/src/module/e_mod_main.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.h16 Sep 2007 03:31:41 - 1.3 +++ e_mod_main.h2 Nov 2007 12:22:16 - 1.4 @@ -30,9 +30,6 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -EAPI int e_modapi_info(E_Module *m); -EAPI int e_modapi_about(E_Module *m); -EAPI int e_modapi_config(E_Module *m); const char *_gc_name(void); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: emu englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : emu Dir : e_modules/emu/src/modules/emu Modified Files: e_mod_main.c e_mod_main.h Log Message: Remove deprecated functions. === RCS file: /cvs/e/e_modules/emu/src/modules/emu/e_mod_main.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_mod_main.c16 Sep 2007 03:31:40 - 1.21 +++ e_mod_main.c2 Nov 2007 12:22:16 - 1.22 @@ -90,27 +90,6 @@ }; /** - * Display your modules about dialog. - * - * @param m a pointer to your E_Module structure. - * @return 1 for success, 0 for failure. - * @ingroup Emu_Module_Basic_Group - */ -EAPI int -e_modapi_about(E_Module *m) -{ - /* This is a basic module dialog that is provided for simplicity, -* but there is probably nothing stopping you from making a complex dialog. */ - e_module_dialog_show(m, D_("Enlightenment Emu Module - gadcon version " VERSION), -D_ -("Experimental generic scriptable module for E17." - "Keep an eye out for the emu's." - "Don't even try to run away, they're fast buggers." - "Hiding in your dunny doesn't help, they can kick dunnies down.")); - return 1; -} - -/** * Setup basic module. * * It is called when the module is enabled. === RCS file: /cvs/e/e_modules/emu/src/modules/emu/e_mod_main.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_mod_main.h7 Jun 2006 03:50:06 - 1.9 +++ e_mod_main.h2 Nov 2007 12:22:16 - 1.10 @@ -58,9 +58,6 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -EAPI int e_modapi_about(E_Module *m); - -EAPI int e_modapi_config (E_Module *m); void _emu_cb_config_updated(void *data); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: bling englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : bling Dir : e_modules/bling Modified Files: e_mod_main.c e_mod_main.h Log Message: Remove deprecated functions. === RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_main.c1 Nov 2007 10:41:41 - 1.8 +++ e_mod_main.c2 Nov 2007 12:22:16 - 1.9 @@ -63,20 +63,6 @@ return 1; } -EAPI int -e_modapi_config(E_Module *m) -{ - Bling *b; - E_Container *con; - - b = m->data; - if (!b) - return 0; - con = e_container_current_get(e_manager_current_get()); - _config_bling_module(con, b); - return 1; -} - static void _bling_shutdown(Bling *b) { === RCS file: /cvs/e/e_modules/bling/e_mod_main.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.h1 Nov 2007 10:41:41 - 1.4 +++ e_mod_main.h2 Nov 2007 12:22:16 - 1.5 @@ -51,7 +51,6 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -EAPI int e_modapi_config(E_Module *m); /* Composite functions */ int composite_init(Bling *b); - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: snow englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : snow Dir : e_modules/snow Modified Files: e_mod_config.c Log Message: Return value. === RCS file: /cvs/e/e_modules/snow/e_mod_config.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- e_mod_config.c 31 Oct 2007 14:38:33 - 1.22 +++ e_mod_config.c 2 Nov 2007 12:49:43 - 1.23 @@ -41,6 +41,7 @@ snprintf(buf, sizeof(buf), "%s/e-module-snow.edj", e_module_dir_get(s->module)); cfd = e_config_dialog_new(con, D_("Snow Configuration"), "Snow", "_e_modules_snow_config_dialog", buf, 0, v, s); s->config_dialog = cfd; + return cfd; } static void - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: rain englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : rain Dir : e_modules/rain Modified Files: e_mod_config.c Log Message: Return value. === RCS file: /cvs/e/e_modules/rain/e_mod_config.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- e_mod_config.c 31 Oct 2007 14:24:14 - 1.24 +++ e_mod_config.c 2 Nov 2007 12:49:43 - 1.25 @@ -42,6 +42,7 @@ cfd = e_config_dialog_new(con, D_("Rain Module"), "Rain", "_e_modules_rain_config_dialog", buf, 0, v, r); r->config_dialog = cfd; } + return cfd; } static void - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: news englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : news Dir : e_modules/news Modified Files: e_modules-news.spec.in Log Message: Hum === RCS file: /cvs/e/e_modules/news/e_modules-news.spec.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_modules-news.spec.in 16 May 2007 12:06:02 - 1.1 +++ e_modules-news.spec.in 2 Nov 2007 12:48:57 - 1.2 @@ -42,9 +42,9 @@ %files -f %{module_name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING* INSTALL NEWS README -if "%{module_name}" == "emu" +%if "%{module_name}" == "emu" %{_bindir}/%{module_name}* -endif +%endif %{_libdir}/enlightenment/modules/%{module_name}* %changelog - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: emu englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : emu Dir : e_modules/emu/src/modules/emu Modified Files: easy_menu.h Log Message: Remove comment. === RCS file: /cvs/e/e_modules/emu/src/modules/emu/easy_menu.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- easy_menu.h 20 Mar 2006 11:37:33 - 1.7 +++ easy_menu.h 2 Nov 2007 12:48:26 - 1.8 @@ -11,7 +11,7 @@ E_Menu_Item *item; char *name; char *action; - char *edje; /* FIXME: make this similar to the e_modapi_info() shit. */ + char *edje; void *data; struct _Menu_Item_Data *next; struct _Easy_Menu *easy_menu; - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: penguins englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : penguins Dir : e_modules/penguins Modified Files: e_mod_config.c e_mod_main.c e_modules-penguins.spec.in Log Message: Fix warnings. === RCS file: /cvs/e/e_modules/penguins/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 20 Oct 2007 13:14:50 - 1.1 +++ e_mod_config.c 2 Nov 2007 12:48:00 - 1.2 @@ -78,8 +78,7 @@ static Evas_Object * _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *of, *ob, *ol, *oi; - E_Radio_Group *rg; + Evas_Object *o, *of, *ob, *ol; Population *pop; pop = cfd->data; @@ -124,7 +123,7 @@ char * name; Evas_Object *oi; theme = l->data; - name = edje_file_data_get (theme, "PopulationName"); + name = edje_file_data_get(theme, "PopulationName"); if (name) { oi = edje_object_add(evas); @@ -133,7 +132,7 @@ printf("TEMA: %s (%s)\n", name, cfdata->theme); e_widget_ilist_append(ol, oi, name, _ilist_cb_selected, theme, theme); - if (strcmp(theme,cfdata->theme) == 0) + if (strcmp(theme, cfdata->theme) == 0) { e_widget_ilist_selected_set(ol, count); } @@ -151,14 +150,10 @@ static void _ilist_cb_selected(void *data) { - E_Config_Dialog_Data *cfdata; char *th; th = data; - //cfdata = data; - //if (!cfdata) return; - printf("CB %s\n",th); - + printf("CB %s\n", th); } static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) === RCS file: /cvs/e/e_modules/penguins/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c2 Nov 2007 12:22:16 - 1.2 +++ e_mod_main.c2 Nov 2007 12:48:00 - 1.3 @@ -1,8 +1,11 @@ #include +#include + #include "config.h" #include "e_mod_main.h" #include "e_mod_config.h" + #define CLIMBER_PROB 4 // 4 Means: one climber every 5 - 1 Means: all climber - !!Don't set to 0 #define FLOATER_PROB 2 #define MAX_FALLER_HEIGHT 300 @@ -135,7 +138,7 @@ if (es->visible) { e_container_shape_geometry_get(es, &x, &y, &w, &h); - printf("E_shape: [%d] x:%d y:%d w:%d h:%d\n", es->visible,x, y, w, h); + printf("E_shape: [%d] x:%d y:%d w:%d h:%d\n", es->visible, x, y, w, h); } } } @@ -154,12 +157,12 @@ { if (ecore_str_has_suffix(filename, ".edj")) { - snprintf(buf,sizeof(buf),"%s/%s",PACKAGE_DATA_DIR"/themes",filename); -name = edje_file_data_get (buf, "PopulationName"); +snprintf(buf, sizeof(buf),"%s/%s", PACKAGE_DATA_DIR"/themes", filename); +name = edje_file_data_get(buf, "PopulationName"); if (name) { - printf("THEME FILE: %s (%s)\n",filename,name); - pop->themes = evas_list_append(pop->themes,strdup(buf)); + printf("THEME FILE: %s (%s)\n", filename, name); + pop->themes = evas_list_append(pop->themes, strdup(buf)); } } } @@ -178,9 +181,9 @@ { Action *a; a = data; - printf("Free Action '%s' :(\n",a->name); + printf("Free Action '%s' :(\n", a->name); E_FREE(a->name); - E_FREE (a); + E_FREE(a); return 1; } static void @@ -242,7 +245,7 @@ while (pop->themes) { - printf("Free Theme '%s' :(\n",pop->themes->data); + printf("Free Theme '%s' :(\n", (char *)pop->themes->data); pop->themes = evas_list_remove_list(pop->themes, pop->themes); } @@ -274,9 +277,8 @@ { Action *act; char *data; - int w, h, speed; - - data = edje_file_data_get (filename, name); + + data = edje_file_data_get(filename, name); if (!data) return NULL; @@ -301,10 +303,9 @@ { Custom_Action *c; char *data; - int w, h, speed; char buf[25]; - data = edje_file_data_get (filename, name); + data = edje_file_data_get(filename, name); if (!data) return NULL; @@ -332,7 +333,7 @@ Evas_Bool hash_fn(Evas_Hash *hash, const char *key, void *data, void *fdata) { Action *a = data; - printf("ACTIONS: name:'%s' w:%d h:%d speed:%d\n",key,a->w,a->h,a->speed); + printf("ACTIONS: name:'%s' w:%d h:%d speed:%d\n", key, a->w, a->h, a->speed); return 1; } @@ -340,7 +341,6 @@ _theme_load(Population *pop) { char *name; - Action *act; char buf[15]; int i; @@ -352,7 +352,7 @@ pop->conf->theme = PACKAGE_DATA_DIR "/default.edj"; - name = edje_file_data_get (pop->conf->theme, "PopulationName"); + name = edje_file_data_get(pop->conf->them
E CVS: penguins englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : penguins Dir : e_modules/penguins Modified Files: .cvsignore Log Message: Ignore nls generated files. === RCS file: /cvs/e/e_modules/penguins/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 20 Oct 2007 13:14:50 - 1.1 +++ .cvsignore 2 Nov 2007 12:47:44 - 1.2 @@ -1,3 +1,4 @@ +ABOUT-NLS .deps .libs Makefile - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: penguins englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : penguins Dir : e_modules/penguins/themes Added Files: .cvsignore Log Message: ignore generated makefiles - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: penguins englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : penguins Dir : e_modules/penguins/themes/lemmings Added Files: .cvsignore Log Message: ignore generated makefiles - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: penguins englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : penguins Dir : e_modules/penguins/themes/default Added Files: .cvsignore Log Message: ignore generated makefiles - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: calendar englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : calendar Dir : e_modules/calendar Modified Files: e_mod_main.c e_modules-calendar.spec.in Log Message: Remove unused variable. === RCS file: /cvs/e/e_modules/calendar/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c1 Nov 2007 10:41:41 - 1.2 +++ e_mod_main.c2 Nov 2007 12:28:03 - 1.3 @@ -184,7 +184,6 @@ if ((ev->button == 3) && (!calendar_conf->menu)) { E_Menu *mn; - E_Menu_Item *mi; int cx, cy, cw, ch; mn = e_menu_new(); === RCS file: /cvs/e/e_modules/calendar/e_modules-calendar.spec.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_modules-calendar.spec.in 26 Sep 2007 14:22:11 - 1.7 +++ e_modules-calendar.spec.in 2 Nov 2007 12:28:03 - 1.8 @@ -7,8 +7,8 @@ License: BSD Group: User Interface/Desktops URL: http://www.enlightenment.org/ -Source: -Packager: +Source: ftp://ftp.enlightenment.org/pub/enlightenment/%{module_name}-%{version}.tar.gz +Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <[EMAIL PROTECTED]>} Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} BuildRequires: ecore-devel, evas-devel, esmart-devel, edje-bin - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_main.c e_mod_main.h Log Message: Remove deprecated functions. === RCS file: /cvs/e/e_modules/language/src/module/e_mod_main.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_mod_main.c1 Nov 2007 10:41:41 - 1.30 +++ e_mod_main.c2 Nov 2007 12:22:16 - 1.31 @@ -291,16 +291,6 @@ return 1; } -EAPI int -e_modapi_config(E_Module *m) -{ - if (!language_config) return 0; - if (language_config->config_dialog) return 0; - _lang_configure_language_module(language_config); - return 1; -} - - /* Just publics **/ void language_face_language_indicator_update() { === RCS file: /cvs/e/e_modules/language/src/module/e_mod_main.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_mod_main.h1 Nov 2007 10:41:41 - 1.17 +++ e_mod_main.h2 Nov 2007 12:22:16 - 1.18 @@ -51,7 +51,6 @@ EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); EAPI int e_modapi_save (E_Module *m); -EAPI int e_modapi_config (E_Module *m); /***/ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: photo englebass
Enlightenment CVS committal Author : englebass Project : e_modules Module : photo Dir : e_modules/photo/src/module Modified Files: e_mod_main.c e_mod_main.h Log Message: Remove deprecated functions. === RCS file: /cvs/e/e_modules/photo/src/module/e_mod_main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_main.c16 Sep 2007 03:31:41 - 1.8 +++ e_mod_main.c2 Nov 2007 12:22:16 - 1.9 @@ -125,28 +125,6 @@ return 1; } -EAPI int -e_modapi_about(E_Module *m) -{ - e_module_dialog_show(m, _("Enlightenment Photo Module - version " MODULE_VERSION), -_("Module to display pictures on your desktop" - "[EMAIL PROTECTED]" - "http://.zapto.org"; - )); - return 1; -} - -EAPI int -e_modapi_config(E_Module *m) -{ - if (!photo) return 0; - if (photo->config_dialog) return 0; - - photo_config_dialog_show(); - - return 1; -} - /* * Gadcon functions === RCS file: /cvs/e/e_modules/photo/src/module/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h7 Jul 2006 17:15:25 - 1.1 +++ e_mod_main.h2 Nov 2007 12:22:16 - 1.2 @@ -48,9 +48,6 @@ EAPI void *e_modapi_init(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_save(E_Module *m); -EAPI int e_modapi_info(E_Module *m); -EAPI int e_modapi_about(E_Module *m); -EAPI int e_modapi_config(E_Module *m); #endif #endif - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_module.h e_msgbus.h Log Message: Declare public functions in headers. === RCS file: /cvs/e/e17/apps/e/src/bin/e_module.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_module.h 31 Oct 2007 12:21:01 - 1.20 +++ e_module.h 2 Nov 2007 12:07:09 - 1.21 @@ -66,6 +66,7 @@ EAPI int e_module_save_all(void); EAPI E_Module*e_module_find(const char *name); EAPI Evas_List *e_module_list(void); +EAPI void e_module_dialog_show(E_Module *m, const char *title, const char *body); EAPI void e_module_delayed_set(E_Module *m, int delayed); #endif === RCS file: /cvs/e/e17/apps/e/src/bin/e_msgbus.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_msgbus.h 25 Sep 2007 14:26:36 - 1.1 +++ e_msgbus.h 2 Nov 2007 12:07:09 - 1.2 @@ -25,6 +25,8 @@ EAPI int e_msgbus_init(void); EAPI int e_msgbus_shutdown(void); +EAPI void e_msgbus_interface_attach(E_DBus_Interface *iface); +EAPI void e_msgbus_interface_detach(E_DBus_Interface *iface); #endif #endif - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: now you can play several files without segfault === RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- emotion_smart.c 31 Oct 2007 19:34:39 - 1.35 +++ emotion_smart.c 2 Nov 2007 11:58:59 - 1.36 @@ -85,17 +85,18 @@ /* Globals for the E Video Object */ /**/ static Evas_Smart *smart = NULL; +static group_id = -1; static unsigned char _emotion_module_open(const char *name, Evas_Object *obj, Emotion_Video_Module **mod, void **video) { Ecore_Plugin *plugin; - int group_id; char *tmp = NULL; Smart_Data *sd; E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, 0); - group_id = ecore_path_group_new("emotion_module"); + if (group_id < 0) + group_id = ecore_path_group_new("emotion_module"); tmp = getenv("EMOTION_MODULES_DIR"); if (tmp) ecore_path_group_add(group_id, tmp); @@ -123,7 +124,9 @@ else printf ("Unable to load module %s\n", name); - ecore_path_group_del(group_id); + if (group_id > 0) + ecore_path_group_del(group_id); + return 0; } @@ -143,8 +146,8 @@ */ /* ecore_plugin_unload(plugin); - ecore_path_group_del(group_id); */ + ecore_path_group_del(group_id); } /***/ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/cpufreq Modified Files: e_mod_main.h Log Message: Remove unused (and deprecated) declaration. === RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/e_mod_main.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_mod_main.h16 Sep 2007 00:02:52 - 1.17 +++ e_mod_main.h2 Nov 2007 11:57:11 - 1.18 @@ -37,6 +37,5 @@ EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); EAPI int e_modapi_save (E_Module *m); -EAPI int e_modapi_about(E_Module *m); #endif - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: ecore_path.c Log Message: fix potential segfault === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_path.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ecore_path.c30 Sep 2007 18:16:42 - 1.21 +++ ecore_path.c2 Nov 2007 11:55:27 - 1.22 @@ -175,6 +175,8 @@ CHECK_PARAM_POINTER_RETURN("name", name, NULL); group = __ecore_path_group_find_id(group_id); + if (!group) + return NULL; /* * Search the paths of the path group for the specified file name - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/e_dbus englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/bin Modified Files: nm.c Log Message: Remove unused variables. === RCS file: /cvs/e/e17/libs/e_dbus/src/bin/nm.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- nm.c31 Oct 2007 10:04:22 - 1.2 +++ nm.c2 Nov 2007 11:41:58 - 1.3 @@ -22,8 +22,6 @@ void cb_manager_get_name(void *data, void *reply, DBusError *err) { - NM_Manager *app = data; - if (dbus_error_is_set(err)) { //XXX @@ -37,8 +35,6 @@ void cb_manager_get_type(void *data, void *reply, DBusError *err) { - NM_Manager *app = data; - if (dbus_error_is_set(err)) { //XXX @@ -52,8 +48,6 @@ void cb_manager_get_hal_udi(void *data, void *reply, DBusError *err) { - NM_Manager *app = data; - if (dbus_error_is_set(err)) { //XXX @@ -67,8 +61,6 @@ void cb_manager_get_ip4_address(void *data, void *reply, DBusError *err) { - NM_Manager *app = data; - if (dbus_error_is_set(err)) { //XXX @@ -87,8 +79,6 @@ void cb_manager_get_link_active(void *data, void *reply, DBusError *err) { - NM_Manager *app = data; - if (dbus_error_is_set(err)) { //XXX @@ -102,8 +92,6 @@ void cb_manager_wireless_get_strength(void *data, void *reply, DBusError *err) { - NM_Manager *app = data; - if (dbus_error_is_set(err)) { //XXX @@ -117,8 +105,6 @@ void cb_manager_wireless_get_active_network(void *data, void *reply, DBusError *err) { - NM_Manager *app = data; - if (dbus_error_is_set(err)) { //XXX @@ -132,7 +118,6 @@ void cb_manager_wireless_get_networks(void *data, void *reply, DBusError *err) { - NM_Manager *app = data; Ecore_List *networks; const char *net; - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/epsilon englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/include Modified Files: Epsilon_Request.h Log Message: formatting. === RCS file: /cvs/e/e17/libs/epsilon/src/include/Epsilon_Request.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Epsilon_Request.h 2 Nov 2007 11:06:36 - 1.5 +++ Epsilon_Request.h 2 Nov 2007 11:07:07 - 1.6 @@ -22,7 +22,7 @@ char *path; /**< Path to file requiring thumbnail */ char *dest; /**< Path to generated file, NULL on error */ void *data; /**< Data associated with this thumbnail. */ - void *_event;/**< private, Pointer to Ecore_Event if it existent. */ + void *_event; /**< private, Pointer to Ecore_Event if it existent. */ }; EAPI extern int EPSILON_EVENT_DONE; /**< Ecore_Event type */ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/epsilon englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/include Modified Files: Epsilon_Request.h Log Message: formatting. === RCS file: /cvs/e/e17/libs/epsilon/src/include/Epsilon_Request.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Epsilon_Request.h 2 Nov 2007 08:03:46 - 1.4 +++ Epsilon_Request.h 2 Nov 2007 11:06:36 - 1.5 @@ -22,7 +22,7 @@ char *path; /**< Path to file requiring thumbnail */ char *dest; /**< Path to generated file, NULL on error */ void *data; /**< Data associated with this thumbnail. */ -void *_event;/**< private, Pointer to Ecore_Event if it existent. */ + void *_event;/**< private, Pointer to Ecore_Event if it existent. */ }; EAPI extern int EPSILON_EVENT_DONE; /**< Ecore_Event type */ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exquisite raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/exquisite Dir : e17/apps/exquisite Modified Files: autogen.sh Log Message: fix autogen === RCS file: /cvs/e/e17/apps/exquisite/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- autogen.sh 2 Nov 2007 06:21:08 - 1.1 +++ autogen.sh 2 Nov 2007 10:52:45 - 1.2 @@ -1,13 +1,16 @@ #!/bin/sh rm -rf autom4te.cache -rm -f aclocal.m4 +rm -f aclocal.m4 ltmain.sh -echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \ -&& echo "Running autoheader..."; autoheader \ -&& echo "Running autoconf..."; autoconf \ -&& echo "Running libtoolize..."; libtoolize --automake \ -&& echo "Running automake..."; automake --add-missing --copy --gnu +touch README -### If you want this, uncomment it. -./configure "$@" +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 +echo "Running autoheader..." ; autoheader || exit 1 +echo "Running autoconf..." ; autoconf || exit 1 +echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 +echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 + +if [ -z "$NOCONFIGURE" ]; then + ./configure "$@" +fi - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/epsilon Modified Files: epsilon.request.pyx Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/epsilon/epsilon.request.pyx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- epsilon.request.pyx 31 Oct 2007 15:25:32 - 1.2 +++ epsilon.request.pyx 2 Nov 2007 08:03:46 - 1.3 @@ -6,10 +6,10 @@ ) def shutdown(): -epsilon_shutdown() +epsilon_request_shutdown() def init(): -return epsilon_thumb_init() +return epsilon_request_init() EPSILON_THUMB_NORMAL = 0 EPSILON_THUMB_LARGE = 1 @@ -26,17 +26,14 @@ The thumbnailer daemon 'epsilon_thumbd' is automatically started. """ -def __init__(self, func, char *path, dest=None, - int size=EPSILON_THUMB_NORMAL): +def __init__(self, func, char *path, int size=EPSILON_THUMB_NORMAL): """Epsilon Request constructor. @parm func: function to call when request is served. @parm path: file to process. -@path dest: if provided (not None), specify where to store the thumb. @path size: EPSILON_THUMB_NORMAL or EPSILON_THUMB_LARGE (it's not the size in pixels!) """ -cdef char *d if not callable(func): raise TypeError("Parameter 'func' must be callable") @@ -46,11 +43,7 @@ if self.obj == NULL: self.func = func -if dest is not None: -d = dest -else: -d = NULL -self.obj = epsilon_add(path, d, size, self) +self.obj = epsilon_request_add(path, size, self) if self.obj != NULL: python.Py_INCREF(self) @@ -68,13 +61,13 @@ def __dealloc__(self): if self.obj != NULL: -epsilon_del(self.obj) +epsilon_request_del(self.obj) self.obj = NULL def delete(self): "Stop thumbnail request, free resources." if self.obj != NULL: -epsilon_del(self.obj) +epsilon_request_del(self.obj) self.obj = NULL self.func = None python.Py_DECREF(self) @@ -106,7 +99,7 @@ property status: def __get__(self): if self.obj != NULL: -return self.obj.status +return bool(self.obj.status) init() - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/entropy barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/entropy Dir : e17/proto/entropy/src/plugins Modified Files: remote_thumbnailer.c thumbnailer.c Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/proto/entropy/src/plugins/remote_thumbnailer.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- remote_thumbnailer.c3 Sep 2007 11:17:17 - 1.17 +++ remote_thumbnailer.c2 Nov 2007 08:03:46 - 1.18 @@ -216,7 +216,7 @@ ecore_hash_set (_ecore_thumb_file_instance_hash, md5_entropy_local_file(new_path), o_request); - epsilon_add(new_path, NULL, EPSILON_THUMB_NORMAL, NULL); + epsilon_add(new_path, EPSILON_THUMB_NORMAL, NULL); entropy_core_file_cache_remove_reference (listener->file->md5); } === RCS file: /cvs/e/e17/proto/entropy/src/plugins/thumbnailer.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- thumbnailer.c 3 Sep 2007 11:17:17 - 1.17 +++ thumbnailer.c 2 Nov 2007 08:03:46 - 1.18 @@ -150,7 +150,7 @@ entropy_core_file_cache_add_reference(request->file->md5); /*printf("'%s' (%s)...\n", buffer, request->file->md5);*/ -epsilon_add(buffer, NULL, EPSILON_THUMB_NORMAL, NULL); +epsilon_add(buffer, EPSILON_THUMB_NORMAL, NULL); } else { return request->file->thumbnail; - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/epsilon barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/plugins Modified Files: Makefile.am xine_thumbnailer.c Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/libs/epsilon/src/plugins/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 9 Jul 2007 16:10:36 - 1.9 +++ Makefile.am 2 Nov 2007 08:03:46 - 1.10 @@ -19,5 +19,5 @@ xine_thumbnailer_la_SOURCES = xine_thumbnailer.c xine_thumbnailer_la_LDFLAGS = -module -avoid-version -xine_thumbnailer_la_LIBADD = @XINE_LIBS@ @IMLIB2_LIBS@ -xine_thumbnailer_la_CFLAGS = @XINE_CFLAGS@ @IMLIB2_CFLAGS@ +xine_thumbnailer_la_LIBADD = @XINE_LIBS@ @IMLIB2_LIBS@ @ECORE_LIBS@ +xine_thumbnailer_la_CFLAGS = @XINE_CFLAGS@ @IMLIB2_CFLAGS@ @ECORE_CFLAGS@ === RCS file: /cvs/e/e17/libs/epsilon/src/plugins/xine_thumbnailer.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- xine_thumbnailer.c 31 Oct 2007 20:33:59 - 1.5 +++ xine_thumbnailer.c 2 Nov 2007 08:03:46 - 1.6 @@ -34,7 +34,7 @@ int yv12_to_rgb (const char *name, int w, int h, DATA8 ** buf, Imlib_Image * rp); Imlib_Image epsilon_generate_thumb (Epsilon * e); -Epsilon_Plugin *epsilon_plugin_init (void); +EAPI Epsilon_Plugin *epsilon_plugin_init (void); /*--*/ Imlib_Image - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_image.c Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- ewl_image.c 17 Oct 2007 22:06:03 - 1.68 +++ ewl_image.c 2 Nov 2007 08:03:46 - 1.69 @@ -688,7 +688,7 @@ #ifdef BUILD_EPSILON_SUPPORT if (!ewl_image_epsilon_handler) { - epsilon_thumb_init(); + epsilon_request_init(); ewl_image_epsilon_handler = ecore_event_handler_add(EPSILON_EVENT_DONE, ewl_image_thumbnail_cb_complete, @@ -754,7 +754,7 @@ size = EPSILON_THUMB_NORMAL; else size = EPSILON_THUMB_LARGE; - thumb->thumb = epsilon_add((char *)path, NULL, size, thumb); + thumb->thumb = epsilon_request_add(path, size, thumb); #else thumb->thumb = NULL; #endif @@ -775,7 +775,7 @@ thumb = EWL_IMAGE_THUMBNAIL(w); if (thumb->thumb) { #ifdef BUILD_EPSILON_SUPPORT - epsilon_del(thumb->thumb); + epsilon_request_del(thumb->thumb); #endif thumb->thumb = NULL; } - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/epsilon barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/lib Modified Files: Epsilon.c Epsilon.h Makefile.am epsilon_thumb.c Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/libs/epsilon/src/lib/Epsilon.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- Epsilon.c 1 Nov 2007 21:50:31 - 1.40 +++ Epsilon.c 2 Nov 2007 08:03:46 - 1.41 @@ -56,10 +56,6 @@ static int _epsilon_exists_ext(Epsilon *e, const char *ext, char *path, int path_size, time_t *mtime); static char *epsilon_hash (const char *file); -static time_t _epsilon_png_mtime_get (const char *file); -#ifdef HAVE_EPEG_H -static time_t _epsilon_jpg_mtime_get (const char *file); -#endif #ifdef HAVE_PNG_H static FILE *_epsilon_open_png_file_reading (const char *filename); static int _epsilon_png_write (const char *file, DATA32 * ptr, @@ -118,6 +114,11 @@ dl_ref = dlopen(path, RTLD_LAZY); if (dl_ref) { epsilon_plugin_init = dlsym(dl_ref, "epsilon_plugin_init"); + if (!epsilon_plugin_init) { + fprintf(stderr, "Failed to load %s: %s", path, dlerror()); + dlclose(dl_ref); + return NULL; + } plugin = (*epsilon_plugin_init)(); } @@ -482,10 +483,16 @@ epsilon_exists (Epsilon * e) { int ok = 0; + struct stat st; + time_t srcmtime; if (!e || !e->src) return (EPSILON_FAIL); + if (stat(e->src, &st) != 0) +return (EPSILON_FAIL); + srcmtime = st.st_mtime; + if (!e->hash) { char hash_seed[PATH_MAX] = ""; @@ -516,12 +523,11 @@ { char path[PATH_MAX]; time_t filemtime; - if (_epsilon_exists_ext(e, "jpg", path, sizeof(path), &filemtime)) -{ - time_t epsilonmtime = _epsilon_jpg_mtime_get(path); - if (filemtime >= epsilonmtime) - return (EPSILON_OK); -} + if (_epsilon_exists_ext(e, "jpg", path, sizeof(path), &filemtime)) { + if (filemtime >= srcmtime) + return (EPSILON_OK); + /* XXX compare with time from e->src exif tag? */ + } } #endif #ifdef HAVE_PNG_H @@ -529,12 +535,11 @@ { char path[PATH_MAX]; time_t filemtime; - if (_epsilon_exists_ext(e, "png", path, sizeof(path), &filemtime)) -{ - time_t epsilonmtime = _epsilon_png_mtime_get(path); - if (filemtime >= epsilonmtime) - return (EPSILON_OK); -} + if (_epsilon_exists_ext(e, "png", path, sizeof(path), &filemtime)) { +if (filemtime >= srcmtime) + return (EPSILON_OK); + /* XXX compare with time from e->src png tag? */ + } #endif } return (EPSILON_FAIL); @@ -747,25 +752,6 @@ } -#ifdef HAVE_EPEG_H -static time_t -_epsilon_jpg_mtime_get (const char *file) -{ - time_t result = 0; - Epeg_Image *im; - Epeg_Thumbnail_Info info; - - if ((im = epeg_file_open (file))) -{ - epeg_thumbnail_comments_get (im, &info); - if (info.mimetype) - result = info.mtime; - epeg_close (im); -} - return (result); -} -#endif - #ifdef HAVE_PNG_H static FILE * _epsilon_open_png_file_reading (const char *filename) @@ -796,52 +782,6 @@ } } return fp; -} - -static time_t -_epsilon_png_mtime_get (const char *file) -{ - time_t result = 0; - FILE *fp = NULL; - - if ((fp = _epsilon_open_png_file_reading (file))) -{ -
E CVS: libs/epsilon barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/bin Modified Files: epsilon_thumb_test.c Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/libs/epsilon/src/bin/epsilon_thumb_test.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- epsilon_thumb_test.c23 Oct 2007 22:04:53 - 1.8 +++ epsilon_thumb_test.c2 Nov 2007 08:03:45 - 1.9 @@ -2,7 +2,6 @@ #include #include #include "Epsilon_Request.h" -#include "Epsilon.h" #include #include #include @@ -43,7 +42,7 @@ exit(0); } - epsilon_thumb_init(); + epsilon_request_init(); thumb_done = ecore_event_handler_add(EPSILON_EVENT_DONE, thumb_complete_cb, NULL); @@ -64,7 +63,7 @@ snprintf(fullpath, PATH_MAX, "%s/%s", argv[1], file); realpath = ecore_file_realpath(fullpath); if (ecore_file_exists(realpath) && !ecore_file_is_dir(realpath)) { - epsilon_add(realpath, NULL, EPSILON_THUMB_NORMAL, NULL); + epsilon_request_add(realpath, EPSILON_THUMB_NORMAL, NULL); incomplete_thumbs++; } free(realpath); @@ -76,6 +75,6 @@ end = ecore_time_get(); printf("\nEpsilon Thumb completed in %g seconds\n\n", end - start); - epsilon_shutdown(); + epsilon_request_shutdown(); return 0; } - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : apps/exhibit Dir : e17/apps/exhibit/src/bin Modified Files: exhibit_main.c exhibit_thumb.c Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -3 -r1.134 -r1.135 --- exhibit_main.c 16 Oct 2007 14:48:56 - 1.134 +++ exhibit_main.c 2 Nov 2007 08:03:45 - 1.135 @@ -437,7 +437,7 @@ else thumb->selected = ETK_FALSE; - epsilon_add((char*)file, NULL, EPSILON_THUMB_NORMAL, thumb); + epsilon_request_add(file, EPSILON_THUMB_NORMAL, thumb); row = etk_tree_row_append(ETK_TREE(e->cur_tab->itree), NULL, e->cur_tab->icol, @@ -1233,7 +1233,7 @@ fprintf(stderr, "WARNING: Exhibit could not set up its options files!\n" " You will not be able to save your preferences.\n"); - epsilon_thumb_init(); + epsilon_request_init(); event_handlers = evas_list_append(event_handlers, ecore_event_handler_add(EPSILON_EVENT_DONE, _ex_thumb_complete, NULL)); === RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_thumb.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- exhibit_thumb.c 16 Oct 2007 14:46:44 - 1.19 +++ exhibit_thumb.c 2 Nov 2007 08:03:45 - 1.20 @@ -126,5 +126,5 @@ thumb->tab = e->cur_tab; thumb->selected = ETK_FALSE; etk_tree_model_cache_remove(thumb->tab->imodel, old_thumb, NULL); - epsilon_add(file, NULL, EPSILON_THUMB_NORMAL, thumb); + epsilon_request_add(file, EPSILON_THUMB_NORMAL, thumb); } - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/epsilon barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/include Modified Files: Epsilon_Request.h epsilon_private.h Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/libs/epsilon/src/include/Epsilon_Request.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Epsilon_Request.h 30 Oct 2007 23:59:31 - 1.3 +++ Epsilon_Request.h 2 Nov 2007 08:03:46 - 1.4 @@ -1,30 +1,11 @@ #ifndef _EPSILON_REQUEST_H #define _EPSILON_REQUEST_H -#ifdef EAPI -#undef EAPI -#endif -#ifdef WIN32 -# ifdef BUILDING_DLL -# define EAPI __declspec(dllexport) -# else -# define EAPI __declspec(dllimport) -# endif -#else -# ifdef __GNUC__ -# if __GNUC__ >= 4 -# define EAPI __attribute__ ((visibility("default"))) -# else -# define EAPI -# endif -# else -# define EAPI -# endif -#endif +#include /** * @file - * @brief Functions for dealing with Epsilon thumbs. + * @brief Functions for dealing with epsilon_thumbd requests. */ #ifdef __cplusplus @@ -35,23 +16,23 @@ struct _Epsilon_Request { - unsigned int id; /**< Identifier for this thumbnail */ - unsigned int size; /**< Thumbnail size to be generated */ - unsigned int status; /**< Status code of the thumbnail generation */ - char *path; /**< Path to file requiring thumbnail */ - char *dest; /**< Path to generated file, NULL on error */ - void *data; /**< Data associated with this thumbnail. */ + unsigned int id; /**< Identifier for this thumbnail */ + unsigned int size; /**< Thumbnail size to be generated */ + unsigned int status; /**< Status code of the thumbnail generation */ + char *path; /**< Path to file requiring thumbnail */ + char *dest; /**< Path to generated file, NULL on error */ + void *data; /**< Data associated with this thumbnail. */ +void *_event;/**< private, Pointer to Ecore_Event if it existent. */ }; -EAPI extern int EPSILON_EVENT_DONE; +EAPI extern int EPSILON_EVENT_DONE; /**< Ecore_Event type */ -EAPI int epsilon_thumb_init(void); -EAPI int epsilon_shutdown(void); -EAPI Epsilon_Request *epsilon_add(char *path, char *dst, int size, void *data); -EAPI void epsilon_del(Epsilon_Request *thumb); +EAPI int epsilon_request_init(void); +EAPI int epsilon_request_shutdown(void); +EAPI Epsilon_Request *epsilon_request_add(const char *path, Epsilon_Thumb_Size size, void *data); +EAPI void epsilon_request_del(Epsilon_Request *thumb); #ifdef __cplusplus } #endif - #endif === RCS file: /cvs/e/e17/libs/epsilon/src/include/epsilon_private.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- epsilon_private.h 23 Oct 2007 22:04:53 - 1.4 +++ epsilon_private.h 2 Nov 2007 08:03:46 - 1.5 @@ -38,7 +38,7 @@ int offset; }; -Epsilon_Message *epsilon_message_new(int clientid, char *path, char *dst, int status); +Epsilon_Message *epsilon_message_new(int clientid, const char *path, int status); int epsilon_ipc_client_send(Ecore_Con_Client *cl, Epsilon_Message *msg); int epsilon_ipc_server_send(Ecore_Con_Server *cl, Epsilon_Message *msg); - This
E CVS: libs/epsilon barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/common Modified Files: epsilon_thumb_common.c Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/libs/epsilon/src/common/epsilon_thumb_common.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- epsilon_thumb_common.c 9 Apr 2006 11:12:12 - 1.4 +++ epsilon_thumb_common.c 2 Nov 2007 08:03:45 - 1.5 @@ -6,26 +6,22 @@ static int mid = 1; Epsilon_Message * -epsilon_message_new(int nid, char *path, char *dst, int status) +epsilon_message_new(int nid, const char *path, int status) { - int size = 0; + int size, pathlen; Epsilon_Message *msg; - int dstlen = 0; - int pathlen = 0; size = sizeof(Epsilon_Message); if (path) pathlen = strlen(path) + 1; + else + pathlen = 0; - if (dst) - dstlen = strlen(dst) + 1; - size += dstlen + pathlen; + size += pathlen; msg = malloc(size); if (msg) { - char *body; - msg->head = EPSILON_MAJOR; msg->status = status; msg->nid = nid; @@ -33,14 +29,9 @@ msg->bufsize = size - sizeof(Epsilon_Message); if (path) { + void *body; body = ((char *)msg) + sizeof(Epsilon_Message); - strcpy(body, path); - } - - if (dst) { - body = ((char *)msg) + sizeof(Epsilon_Message) - + pathlen; - strcpy(body, dst); + memcpy(body, path, pathlen); } } - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/python-efl barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto/python-efl Dir : e17/proto/python-efl/python-epsilon/include/epsilon Modified Files: request.pxd Log Message: Epsilon major overhaul, breaks API. I fixed many issues with epsilon, mainly the Epsilon_Requests, since it broke the ABI, I also changed the API and now it looks a bit better. Changes overview: - epsilon_thumb_{init,shutdown} -> epsilon_request_{init,shutdown} - epsilon_del -> epsilon_request_del() - epsilon_add(file, dest, size, data) -> epsilon_request_add(file, size, data) reason: nobody was using "dest", and if one tried to, it was not implemented. Instead of implementing this, leave to users that could call ecore_file_cp() on the handler. - epsilon_request_add() has a fast path check for already existent thumbnails, instead of going to the server, just ecore_event_add(). To handle epsilon_request_del() fine, we now have to keep the Ecore_Event for further deletion. - epsilon_exists() now just checks the mtime of source and thumbnail, if source is newer, then return EPSILON_FAIL so users regenerate it. There is a possible optimization to be done (it's marked on code in the right place) that can read original file tags to avoid regenerating for copies, but it's not reliable and should be checked after the current ones. - reoder CFLAGS path order to first use local headers instead of the system. - check for errors when loading plugins. - updated every use of these API in e17 CVS. If you find a problem with these, let me know and I'll fix. === RCS file: /cvs/e/e17/proto/python-efl/python-epsilon/include/epsilon/request.pxd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- request.pxd 31 Oct 2007 15:25:33 - 1.2 +++ request.pxd 2 Nov 2007 08:03:46 - 1.3 @@ -13,10 +13,10 @@ int EPSILON_EVENT_DONE -int epsilon_thumb_init() -int epsilon_shutdown() -Epsilon_Request *epsilon_add(char *path, char *dst, int size, void *data) -void epsilon_del(Epsilon_Request *thumb) +int epsilon_request_init() +int epsilon_request_shutdown() +Epsilon_Request *epsilon_request_add(char *path, int size, void *data) +void epsilon_request_del(Epsilon_Request *thumb) cdef extern from "Ecore.h": - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs