[EGIT] [core/enlightenment] master 03/04: completely remove access module
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=18484e7eee720b65b1c99d7d80f4dd1ac7fa56bd commit 18484e7eee720b65b1c99d7d80f4dd1ac7fa56bd Author: Mike BlumenkrantzDate: Thu Oct 22 13:50:18 2015 -0400 completely remove access module as promised almost a year ago, this module has been unmaintained to the point where it cannot function in any way, and attempting to keep it in the tree is a futile effort this module can now be found at devs/discomfitor/e_module-access.git ref 77717523f3e6c327ddd797ad064a97c467e6f90b --- configure.ac |1 - src/bin/e_module.c |1 - src/modules/Makefile.mk |2 - src/modules/Makefile_access.mk | 20 - src/modules/access/e_mod_config.c| 77 --- src/modules/access/e_mod_main.c | 1027 -- src/modules/access/e_mod_main.h | 12 - src/modules/access/module.desktop.in | 38 -- 8 files changed, 1178 deletions(-) diff --git a/configure.ac b/configure.ac index fcfeebd..6ab4e87 100644 --- a/configure.ac +++ b/configure.ac @@ -912,7 +912,6 @@ AC_E_OPTIONAL_MODULE([tasks], true) AC_E_OPTIONAL_MODULE([conf_randr], true) AC_E_OPTIONAL_MODULE([xkbswitch], true, $ecore_x) AC_E_OPTIONAL_MODULE([tiling], true) -#AC_E_OPTIONAL_MODULE([access], false, $ecore_x) AC_E_OPTIONAL_MODULE([music_control], true, [CHECK_MODULE_MUSIC_CONTROL]) AC_E_OPTIONAL_MODULE([packagekit], true) AC_E_OPTIONAL_MODULE([wl_desktop_shell], $have_wayland, [CHECK_MODULE_WL_DESKTOP_SHELL]) diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 768cc63..7b9aaef 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -900,7 +900,6 @@ _e_module_whitelist_check(void) const char *s; const char *goodmods[] = { - "access", "backlight", "battery", "bluez4", diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index 0ddee49..3ea3148 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -103,8 +103,6 @@ include src/modules/Makefile_xkbswitch.mk include src/modules/Makefile_tiling.mk -#include src/modules/Makefile_access.mk - include src/modules/Makefile_music_control.mk include src/modules/Makefile_packagekit.mk diff --git a/src/modules/Makefile_access.mk b/src/modules/Makefile_access.mk deleted file mode 100644 index 19024f5..000 --- a/src/modules/Makefile_access.mk +++ /dev/null @@ -1,20 +0,0 @@ -EXTRA_DIST += src/modules/access/module.desktop.in -if USE_MODULE_ACCESS -accessdir = $(MDIR)/access -access_DATA = src/modules/access/module.desktop - - -accesspkgdir = $(MDIR)/access/$(MODULE_ARCH) -accesspkg_LTLIBRARIES = src/modules/access/module.la - -src_modules_access_module_la_LIBADD = $(MOD_LIBS) -src_modules_access_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -src_modules_access_module_la_LDFLAGS = $(MOD_LDFLAGS) -src_modules_access_module_la_SOURCES = src/modules/access/e_mod_main.c \ - src/modules/access/e_mod_main.h \ - src/modules/access/e_mod_config.c - -PHONIES += access install-access -access: $(accesspkg_LTLIBRARIES) $(access_DATA) -install-access: install-accessDATA install-accesspkgLTLIBRARIES -endif diff --git a/src/modules/access/e_mod_config.c b/src/modules/access/e_mod_config.c deleted file mode 100644 index 51eb577..000 --- a/src/modules/access/e_mod_config.c +++ /dev/null @@ -1,77 +0,0 @@ -#include "e.h" -#include "e_mod_main.h" - -struct _E_Config_Dialog_Data -{ - int dummy; -}; - -/* local function prototypes */ -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 EINA_UNUSED, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply (E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata); - -void -_config_pager_module(void) -{ - E_Config_Dialog_View *v; - - if (e_config_dialog_find("E", "_e_mod_access_config_dialog")) - return; - v = E_NEW(E_Config_Dialog_View, 1); - if (!v) return; - - v->create_cfdata =_create_data; - v->free_cfdata = _free_data; - v->basic.create_widgets = _basic_create; - v->basic.apply_cfdata = _basic_apply; - - e_config_dialog_new(NULL, _("Access Settings"), "E", - "_e_mod_access_config_dialog", - "preferences-desktop-access", 0, v, NULL); -} - -/* local function prototypes */ -static void * -_create_data(E_Config_Dialog *cfd EINA_UNUSED) -{ - E_Config_Dialog_Data *cfdata; - - cfdata = E_NEW(E_Config_Dialog_Data, 1); - _fill_data(cfdata); - return cfdata; -} - -static void -_fill_data(E_Config_Dialog_Data *cfdata) -{ - cfdata->dummy = 1; -} - -static void
[EGIT] [core/enlightenment] master 02/04: remove dead modules from whitelist
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d3f229d45025a2125e493c35431e4b251a15f1af commit d3f229d45025a2125e493c35431e4b251a15f1af Author: Mike BlumenkrantzDate: Thu Oct 22 13:18:14 2015 -0400 remove dead modules from whitelist --- src/bin/e_module.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 830ac8d..768cc63 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -937,7 +937,6 @@ _e_module_whitelist_check(void) "ofono", "pager", "pager_plain", - "physics", "quickaccess", "shot", "start", @@ -956,7 +955,6 @@ _e_module_whitelist_check(void) "wl_shell", "wl_desktop_shell", "xkbswitch", - "echievements", "music-control", "appmenu", "packagekit", --
[EGIT] [core/enlightenment] master 04/04: defer all module error dialogs
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=14a9318ff9562988f83d351e75c6cc97b8e8 commit 14a9318ff9562988f83d351e75c6cc97b8e8 Author: Mike BlumenkrantzDate: Thu Oct 22 14:14:20 2015 -0400 defer all module error dialogs due to the (current) synchronous creation of wayland surfaces in efl, creating these dialogs during startup will result in a crash. the only way to prevent this and still display the dialogs is to wait a bit and show the dialogs after init has completed --- src/bin/e_module.c | 125 ++--- 1 file changed, 71 insertions(+), 54 deletions(-) diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 7b9aaef..2e1648f 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -9,7 +9,7 @@ /* local subsystem functions */ static void _e_module_free(E_Module *m); -static void _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m); +static void _e_module_dialog_disable_create(const char *title, const char *body, E_Module *m); static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia); static void _e_module_event_update_free(void *data, void *event); static Eina_Bool _e_module_cb_idler(void *data); @@ -349,7 +349,7 @@ e_module_new(const char *name) _("There was an error loading the module named: %s" "No module named %s could be found in the" "module search directories."), name, buf); -_e_module_dialog_disable_show(_("Error loading Module"), body, m); +_e_module_dialog_disable_create(_("Error loading Module"), body, m); m->error = 1; goto init_done; } @@ -362,7 +362,7 @@ e_module_new(const char *name) "%s" "The error reported was:" "%s"), name, buf, dlerror()); -_e_module_dialog_disable_show(_("Error loading Module"), body, m); +_e_module_dialog_disable_create(_("Error loading Module"), body, m); m->error = 1; goto init_done; } @@ -380,7 +380,7 @@ e_module_new(const char *name) "The error reported was:" "%s"), name, buf, _("Module does not contain all needed functions")); -_e_module_dialog_disable_show(_("Error loading Module"), body, m); +_e_module_dialog_disable_create(_("Error loading Module"), body, m); m->api = NULL; m->func.init = NULL; m->func.shutdown = NULL; @@ -402,7 +402,7 @@ e_module_new(const char *name) snprintf(title, sizeof(title), _("Enlightenment %s Module"), _(m->api->name)); -_e_module_dialog_disable_show(title, body, m); +_e_module_dialog_disable_create(title, body, m); m->api = NULL; m->func.init = NULL; m->func.shutdown = NULL; @@ -759,6 +759,13 @@ _e_module_desktop_list_cb(const Eina_Hash *hash EINA_UNUSED, const void *key EIN return EINA_TRUE; } +typedef struct Disable_Dialog +{ + char *title; + char *body; + E_Module *m; +} Disable_Dialog; + static void _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m) { @@ -767,14 +774,7 @@ _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m) printf("MODULE ERR:\n%s\n", body); - /* FIXME: Stupid hack for ELM_WIN_DIALOG_BASIC not working in wayland */ -#warning REMOVE STUPID ELM HACK FOR WAYLAND BEFORE RELEASE - if (e_comp && e_comp->comp_type != E_PIXMAP_TYPE_WL) - dia = e_dialog_new(NULL, "E", "_module_unload_dialog"); - else - dia = e_dialog_normal_win_new(NULL, "E", "_module_unload_dialog"); - - EINA_SAFETY_ON_NULL_RETURN(dia); + dia = e_dialog_new(NULL, "E", "_module_unload_dialog"); snprintf(buf, sizeof(buf), "%s%s", body, _("What action should be taken with this module?")); @@ -789,6 +789,28 @@ _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m) e_dialog_show(dia); } +static Eina_Bool +_e_module_dialog_disable_timer(Disable_Dialog *dd) +{ + _e_module_dialog_disable_show(dd->title, dd->body, dd->m); + free(dd->title); + free(dd->body); + free(dd); + return EINA_FALSE; +} + +static void +_e_module_dialog_disable_create(const char *title, const char *body, E_Module *m) +{ + Disable_Dialog *dd; + + dd = E_NEW(Disable_Dialog, 1); + dd->title = strdup(title); + dd->body = strdup(body); + dd->m = m; + ecore_timer_add(1.5, (Ecore_Task_Cb)_e_module_dialog_disable_timer, dd); +} + static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia) { @@ -890,6 +912,41 @@ _ignore_cb(void *data, E_Dialog *dialog) e_config_save_queue(); } +static Eina_Bool +_e_module_whitelist_dialog_timer(void *badl) +{ + E_Dialog *dia; + Eina_Strbuf *sbuf; + Eina_List
[EGIT] [core/enlightenment] master 01/04: unconditionally show opengl option in compositor settings
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9bf2438ba92b5842f8e213bd61e0f0735ca87b52 commit 9bf2438ba92b5842f8e213bd61e0f0735ca87b52 Author: Mike BlumenkrantzDate: Thu Oct 22 12:49:51 2015 -0400 unconditionally show opengl option in compositor settings enlightenment is not always running in x11, so making this option dependent on xlib will break other environments --- src/bin/e_int_config_comp.c | 17 + 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/bin/e_int_config_comp.c b/src/bin/e_int_config_comp.c index 92dd506..07ee16b 100644 --- a/src/bin/e_int_config_comp.c +++ b/src/bin/e_int_config_comp.c @@ -265,13 +265,12 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data rg = e_widget_radio_group_new(&(cfdata->engine)); ob = e_widget_radio_add(evas, _("Software"), E_COMP_ENGINE_SW, rg); e_widget_framelist_object_append(of, ob); - if (!getenv("ECORE_X_NO_XLIB")) + ob = e_widget_radio_add(evas, _("OpenGL"), E_COMP_ENGINE_GL, rg); + e_widget_framelist_object_append(of, ob); + if ((e_comp->comp_type == E_PIXMAP_TYPE_X) && (!getenv("ECORE_X_NO_XLIB"))) { if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11)) { - ob = e_widget_radio_add(evas, _("OpenGL"), E_COMP_ENGINE_GL, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_label_add(evas, _("OpenGL options:")); e_widget_framelist_object_append(of, ob); ob = e_widget_check_add(evas, _("Tear-free updates (VSynced)"), &(cfdata->vsync)); @@ -600,14 +599,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, rg = e_widget_radio_group_new(&(cfdata->engine)); ob = e_widget_radio_add(evas, _("Software"), E_COMP_ENGINE_SW, rg); e_widget_framelist_object_append(of, ob); - if (!getenv("ECORE_X_NO_XLIB")) - { -if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_X11)) - { - ob = e_widget_radio_add(evas, _("OpenGL"), E_COMP_ENGINE_GL, rg); - e_widget_framelist_object_append(of, ob); - } - } + ob = e_widget_radio_add(evas, _("OpenGL"), E_COMP_ENGINE_GL, rg); + e_widget_framelist_object_append(of, ob); ob = e_widget_label_add(evas, _("To reset compositor:")); e_widget_framelist_object_append(of, ob); ob = e_widget_label_add(evas, _("Ctrl+Alt+Shift+Home")); --
[EGIT] [core/elementary] master 01/02: dayselector: fix warning related to argument type
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=a10e9664c8a51e9d8d8997ab53ec7e76b9a26220 commit a10e9664c8a51e9d8d8997ab53ec7e76b9a26220 Author: Vivek EllurDate: Thu Oct 22 12:37:44 2015 -0700 dayselector: fix warning related to argument type Summary: @fix Signed-off-by: Vivek Ellur Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D3215 Signed-off-by: Cedric BAIL --- src/lib/elm_dayselector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c index 6f60147..0f76ab9 100644 --- a/src/lib/elm_dayselector.c +++ b/src/lib/elm_dayselector.c @@ -401,7 +401,7 @@ _items_create(Evas_Object *obj) strftime(buf, sizeof(buf), "%a", _daysel); elm_object_text_set(chk, buf); -snprintf(buf, sizeof(buf), "day%d", idx); +snprintf(buf, sizeof(buf), "day%u", idx); elm_layout_content_set(obj, buf, chk); // XXX: ACCESS --
[EGIT] [core/elementary] master 02/02: elm_index: Fix memory leak issue in realloc failure
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4492153c6ad360a97ab990f340ebf5be55218789 commit 4492153c6ad360a97ab990f340ebf5be55218789 Author: Vivek EllurDate: Thu Oct 22 12:38:28 2015 -0700 elm_index: Fix memory leak issue in realloc failure Summary: @Fix Signed-off-by: Vivek Ellur Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D3214 --- src/lib/elm_index.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index 83194a7..7f3cb39 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -770,14 +770,17 @@ _sel_eval(Evas_Object *obj, { if (label && last) { -label = realloc(label, strlen(label) + +char *temp; + +temp = realloc(label, strlen(label) + strlen(last) + 1); -if (!label) +if (!temp) { + free(label); free(last); return; } -strcat(label, last); +label = strcat(temp, last); } } free(last); --
[EGIT] [core/efl] master 01/01: ecore: use recursive lock for _ecore_glib_select
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7a046b0c368d45076f505ca8206b68f6a8554453 commit 7a046b0c368d45076f505ca8206b68f6a8554453 Author: Shinwoo KimDate: Thu Oct 22 12:28:51 2015 -0700 ecore: use recursive lock for _ecore_glib_select Summary: Fix a deadlock caused by recursive call of _ecore_glib_select. Test Plan: Delete elm_image on the glib callback(ref: g_source_set_callback). The _elm_image_evas_object_smart_del calls ecore_thread_wait. Reviewers: raster, jpeg, woohyun, jaehwan, Hermet, seoz, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3202 Signed-off-by: Cedric BAIL --- src/lib/ecore/ecore_glib.c | 47 +++--- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/lib/ecore/ecore_glib.c b/src/lib/ecore/ecore_glib.c index 7eacdeb..e2586c1 100644 --- a/src/lib/ecore/ecore_glib.c +++ b/src/lib/ecore/ecore_glib.c @@ -18,8 +18,11 @@ static size_t _ecore_glib_fds_size = 0; static const size_t ECORE_GLIB_FDS_INITIAL = 128; static const size_t ECORE_GLIB_FDS_STEP = 8; static const size_t ECORE_GLIB_FDS_MAX_FREE = 256; -static GMutex *_ecore_glib_select_lock; -static GCond *_ecore_glib_select_cond; +#if GLIB_CHECK_VERSION(2,32,0) +static GRecMutex *_ecore_glib_select_lock; +#else +static GStaticRecMutex *_ecore_glib_select_lock; +#endif static Eina_Bool _ecore_glib_fds_resize(size_t size) @@ -190,21 +193,26 @@ _ecore_glib_select(int ecore_fds, ctx = g_main_context_default(); - if (g_main_context_acquire(ctx)) + if (!g_main_context_acquire(ctx)) { -g_mutex_lock(_ecore_glib_select_lock); - } - else - { -while (!g_main_context_wait(ctx, _ecore_glib_select_cond, -_ecore_glib_select_lock)) +while (!g_main_context_is_owner(ctx)) g_thread_yield(); } +#if GLIB_CHECK_VERSION(2,32,0) + g_rec_mutex_lock(_ecore_glib_select_lock); +#else + g_static_rec_mutex_lock(_ecore_glib_select_lock); +#endif + ret = _ecore_glib_select__locked (ctx, ecore_fds, rfds, wfds, efds, ecore_timeout); - g_mutex_unlock(_ecore_glib_select_lock); +#if GLIB_CHECK_VERSION(2,32,0) + g_rec_mutex_unlock(_ecore_glib_select_lock); +#else + g_static_rec_mutex_unlock(_ecore_glib_select_lock); +#endif g_main_context_release(ctx); return ret; @@ -217,14 +225,12 @@ _ecore_glib_init(void) { #ifdef HAVE_GLIB #if GLIB_CHECK_VERSION(2,32,0) - _ecore_glib_select_lock = malloc(sizeof(GMutex)); - g_mutex_init(_ecore_glib_select_lock); - _ecore_glib_select_cond = malloc(sizeof(GCond)); - g_cond_init(_ecore_glib_select_cond); + _ecore_glib_select_lock = malloc(sizeof(GRecMutex)); + g_rec_mutex_init(_ecore_glib_select_lock); #else if (!g_thread_get_initialized()) g_thread_init(NULL); - _ecore_glib_select_lock = g_mutex_new(); - _ecore_glib_select_cond = g_cond_new(); + _ecore_glib_select_lock = malloc(sizeof(GStaticRecMutex)); + g_static_rec_mutex_init(_ecore_glib_select_lock); #endif #endif } @@ -247,17 +253,12 @@ _ecore_glib_shutdown(void) _ecore_glib_fds_size = 0; #if GLIB_CHECK_VERSION(2,32,0) - g_mutex_clear(_ecore_glib_select_lock); + g_rec_mutex_clear(_ecore_glib_select_lock); free(_ecore_glib_select_lock); _ecore_glib_select_lock = NULL; - g_cond_clear(_ecore_glib_select_cond); - free(_ecore_glib_select_cond); - _ecore_glib_select_cond = NULL; #else - g_mutex_free(_ecore_glib_select_lock); + g_static_rec_mutex_free(_ecore_glib_select_lock); _ecore_glib_select_lock = NULL; - g_cond_free(_ecore_glib_select_cond); - _ecore_glib_select_cond = NULL; #endif #endif } --
[EGIT] [core/elementary] master 01/01: Fix typo in docs
davemds pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=7681bfdbc816af57656af090f3529158084356b9 commit 7681bfdbc816af57656af090f3529158084356b9 Author: Dave AndreoliDate: Thu Oct 22 19:35:51 2015 +0200 Fix typo in docs not "a castrated ram (a male sheep)" :D --- src/lib/elm_hoversel.eo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_hoversel.eo b/src/lib/elm_hoversel.eo index b537ed1..ae67b10 100644 --- a/src/lib/elm_hoversel.eo +++ b/src/lib/elm_hoversel.eo @@ -43,7 +43,7 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface, } } @property scrollable { - [[Control wether scrolling is enabled. + [[Control whether scrolling is enabled. This Limit the size of contents and make them scrollable. --
[EGIT] [core/efl] master 01/01: efl tests - ecore fb - disable as it basically is more pain than gain
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b1600b2daa0d5de62b5f738d7845fd512aa6bfba commit b1600b2daa0d5de62b5f738d7845fd512aa6bfba Author: Carsten Haitzler (Rasterman)Date: Thu Oct 22 19:19:50 2015 +0900 efl tests - ecore fb - disable as it basically is more pain than gain this means make check is more useful to people. --- src/tests/ecore/ecore_test_ecore_fb.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/src/tests/ecore/ecore_test_ecore_fb.c b/src/tests/ecore/ecore_test_ecore_fb.c index 3544523..ee5bbb1 100644 --- a/src/tests/ecore/ecore_test_ecore_fb.c +++ b/src/tests/ecore/ecore_test_ecore_fb.c @@ -13,6 +13,12 @@ START_TEST(ecore_test_ecore_fb_init) { +// SKIP fb test as all it tests is init and shutdown and nothing else +// and these require basically a linux box with root or special +// permission access etc. etc. which prety much will NOt be the case +// on any build machine runing make check - so de-noise the tests +// so we can focus on the rest that should work +/* int ret, i, j; for (i = 1; i <= MAX_ITER; i++) @@ -28,6 +34,7 @@ START_TEST(ecore_test_ecore_fb_init) fprintf(stderr, "Deleted %d ecore fb instance.\n", MAX_ITER - j); fail_if(ret != j); } + */ } END_TEST --
[EGIT] [core/efl] master 01/02: emile: fix typos catched by coverity.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=573438d081bdef6cbd8ffc4ed37ffb0b581aefc6 commit 573438d081bdef6cbd8ffc4ed37ffb0b581aefc6 Author: Cedric BAILDate: Thu Oct 22 16:56:39 2015 -0700 emile: fix typos catched by coverity. CID1328666 --- src/lib/emile/emile_compress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/emile/emile_compress.c b/src/lib/emile/emile_compress.c index e2d23d4..0d2e605 100644 --- a/src/lib/emile/emile_compress.c +++ b/src/lib/emile/emile_compress.c @@ -57,7 +57,7 @@ emile_compress(const Eina_Binbuf *data, eina_binbuf_length_get(data)); /* It is going to be smaller and should never fail, if it does you are in deep poo. */ temp = realloc(compact, length); -if (temp) temp = compact; +if (temp) compact = temp; if (length > 0) ok = EINA_TRUE; --
[EGIT] [core/efl] master 02/02: efl: fix path parsing to actually check the value returned by strtol.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7f28b3c263c6615629973b0b33744dad34c7a49e commit 7f28b3c263c6615629973b0b33744dad34c7a49e Author: Cedric BAILDate: Thu Oct 22 16:57:24 2015 -0700 efl: fix path parsing to actually check the value returned by strtol. CID1328665 --- src/lib/efl/interfaces/efl_gfx_shape.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c b/src/lib/efl/interfaces/efl_gfx_shape.c index dfcea4b..7533040 100644 --- a/src/lib/efl/interfaces/efl_gfx_shape.c +++ b/src/lib/efl/interfaces/efl_gfx_shape.c @@ -1119,7 +1119,7 @@ _efl_gfx_path_parse_arc(const char *content, char **end, // sweeo *sweep = strtol(end1, , 10) ? EINA_TRUE : EINA_FALSE; -if (!end1 || (end1 == end2)) return EINA_FALSE; +if (!end2 || (end1 == end2)) return EINA_FALSE; str = _skipcomma(end2); if (_parse_number(, x)) --
[EGIT] [core/elementary] master 01/01: image: use eo_isa for checking object types instead of string comparison
ami pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=55373e799a797ac48a94ff5ecf1e112924641eed commit 55373e799a797ac48a94ff5ecf1e112924641eed Author: Amitesh SinghDate: Thu Oct 22 22:14:40 2015 +0530 image: use eo_isa for checking object types instead of string comparison --- src/lib/elm_image.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c index c6d9850..f76eb9a 100644 --- a/src/lib/elm_image.c +++ b/src/lib/elm_image.c @@ -122,17 +122,13 @@ static void _elm_image_internal_sizing_eval(Evas_Object *obj, Elm_Image_Data *sd) { Evas_Coord x, y, w, h; - const char *type; if (!sd->img) return; w = sd->img_w; h = sd->img_h; - type = evas_object_type_get(sd->img); - if (!type) return; - - if (!strcmp(type, "edje")) + if (eo_isa(sd->img, EDJE_OBJECT_CLASS)) { x = sd->img_x; y = sd->img_y; @@ -1268,15 +1264,11 @@ _elm_image_object_size_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int { int tw, th; int cw = 0, ch = 0; - const char *type; if (w) *w = 0; if (h) *h = 0; - type = evas_object_type_get(sd->img); - if (!type) return; - - if (!strcmp(type, "edje")) + if (eo_isa(sd->img, EDJE_OBJECT_CLASS)) edje_object_size_min_get(sd->img, , ); else evas_object_image_size_get(sd->img, , ); --
[EGIT] [core/elementary] master 01/01: flip: use eo_isa for checking object types
ami pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=7245bc20dc235b4463c21dd8eced6f5f0d98d6fd commit 7245bc20dc235b4463c21dd8eced6f5f0d98d6fd Author: Amitesh SinghDate: Thu Oct 22 22:36:01 2015 +0530 flip: use eo_isa for checking object types --- src/lib/elm_flip.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c index e9b54f5..820a822 100644 --- a/src/lib/elm_flip.c +++ b/src/lib/elm_flip.c @@ -933,11 +933,10 @@ static void _map_uv_set(Evas_Object *obj, Evas_Map *map) { Evas_Coord x, y, w, h; - const char *type = evas_object_type_get(obj); // FIXME: only handles filled obj - if ((type) && (!strcmp(type, "image") && - !evas_object_image_source_get(obj))) + if (eo_isa(obj, EVAS_IMAGE_CLASS) && + !evas_object_image_source_get(obj)) { int iw, ih; evas_object_image_size_get(obj, , ); --