[EGIT] [core/efl] master 02/04: efreetd - cache generators - dont unlink then rename - fix
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6b493430df51eb7b89910c86bec6497a2c6eea53
commit 6b493430df51eb7b89910c86bec6497a2c6eea53
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sun Apr 12 22:18:48 2015 +0900
efreetd - cache generators - dont unlink then rename - fix
if you unlink then rename, there is a gap between the unlink and
rename - no file is there. the point of the rename is to be atomic.
either old file OR new file. nothing in between. this fixes that race.
---
src/bin/efreet/efreet_desktop_cache_create.c | 8
1 file changed, 8 deletions(-)
diff --git a/src/bin/efreet/efreet_desktop_cache_create.c
b/src/bin/efreet/efreet_desktop_cache_create.c
index 4fa3ef4..498daa4 100644
--- a/src/bin/efreet/efreet_desktop_cache_create.c
+++ b/src/bin/efreet/efreet_desktop_cache_create.c
@@ -493,14 +493,6 @@ main(int argc, char **argv)
/* unlink old cache files */
if (changed)
{
-if (unlink(efreet_desktop_cache_file()) 0)
-{
-if (errno != ENOENT) goto error;
-}
-if (unlink(efreet_desktop_util_cache_file()) 0)
-{
-if (errno != ENOENT) goto error;
-}
/* rename tmp files to real files */
if (rename(util_file, efreet_desktop_util_cache_file()) 0) goto
error;
efreet_setowner(efreet_desktop_util_cache_file());
--
[EGIT] [core/efl] master 04/07: evas-3d: Fix Resource leak from CID1271635
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3eed18d231c680dcabfe24b18bfa889026ba85ac commit 3eed18d231c680dcabfe24b18bfa889026ba85ac Author: Chris Michael cp.mich...@samsung.com Date: Sun Apr 12 20:55:49 2015 -0400 evas-3d: Fix Resource leak from CID1271635 Summary: This fixes a reported resource leak (by coverity). _pack_meshes_vertex_data allocates memory stored in 'vertices' however vertices is never free'd unless count 0 @fix Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/lib/evas/canvas/evas_3d_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_3d_node.c b/src/lib/evas/canvas/evas_3d_node.c index 746665e..c9c2fb4 100644 --- a/src/lib/evas/canvas/evas_3d_node.c +++ b/src/lib/evas/canvas/evas_3d_node.c @@ -570,8 +570,8 @@ _update_node_shapes(Evas_3D_Node *node) _rotate_vertices(pd-orientation_world, count, vertices); _calculate_box(pd-local_aabb, count, vertices); } - free(vertices); } +free(vertices); } pd-bsphere.radius = pd-local_bsphere.radius; --
[EGIT] [core/efl] master 03/07: ector: Fix Coverity CID1293003
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d3d909bf9e2d540ecb0e7303d4323b78d6bab10c
commit d3d909bf9e2d540ecb0e7303d4323b78d6bab10c
Author: Chris Michael cp.mich...@samsung.com
Date: Sun Apr 12 20:51:31 2015 -0400
ector: Fix Coverity CID1293003
Summary: This fixes an issue of coverity reporting Explicit null
dereference as fetchfunc is defaulted to NULL, yet no check is made
later before calling it.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ector/software/ector_software_rasterizer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/ector/software/ector_software_rasterizer.c
b/src/lib/ector/software/ector_software_rasterizer.c
index 71eaa1f..495e50f 100644
--- a/src/lib/ector/software/ector_software_rasterizer.c
+++ b/src/lib/ector/software/ector_software_rasterizer.c
@@ -80,7 +80,8 @@ _blend_gradient(int count, const SW_FT_Span *spans, void
*user_data)
while (length)
{
int l = MIN(length, buffer_size);
- fetchfunc(buffer, data, spans-y, spans-x, l);
+ if (fetchfunc)
+fetchfunc(buffer, data, spans-y, spans-x, l);
if (data-mul_col == 0x)
_ector_comp_func_source_over(target, buffer, l,
spans-coverage); // TODO use proper composition func
else
--
[EGIT] [tools/edi] master 01/07: Fix crash where clang encounters too many errors
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=6fc3da889b1da451ae61470079e235fcbbe51bf3
commit 6fc3da889b1da451ae61470079e235fcbbe51bf3
Author: Andy Williams a...@andywilliams.me
Date: Sun Apr 12 15:39:47 2015 +0100
Fix crash where clang encounters too many errors
---
src/bin/editor/edi_editor.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index aacd289..bd8e6cd 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -295,6 +295,12 @@ _edi_line_status_set(Edi_Editor *editor, unsigned int
number, Elm_Code_Status_Ty
eo_do(editor-entry,
code = elm_code_widget_code_get());
line = elm_code_file_line_get(code-file, number);
+ if (!line)
+ {
+if (text)
+ ERR(Status on invalid line %d (\%s\), number, text);
+return;
+ }
ecore_thread_main_loop_begin();
--
[EGIT] [tools/edi] master 01/01: elm_code: retain line formatting on file callback
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=675bcb51ea6b2c2f0934fb77006b3de2cff4d42d
commit 675bcb51ea6b2c2f0934fb77006b3de2cff4d42d
Author: Andy Williams a...@andywilliams.me
Date: Mon Apr 13 00:15:21 2015 +0100
elm_code: retain line formatting on file callback
We don't need to reset all the lines in file load - just clear
---
elm_code/src/lib/elm_code_parse.c | 7 ---
1 file changed, 7 deletions(-)
diff --git a/elm_code/src/lib/elm_code_parse.c
b/elm_code/src/lib/elm_code_parse.c
index 02c878a..408fd48 100644
--- a/elm_code/src/lib/elm_code_parse.c
+++ b/elm_code/src/lib/elm_code_parse.c
@@ -37,13 +37,6 @@ _elm_code_parse_file(Elm_Code *code, Elm_Code_File *file)
{
Elm_Code_Parser *parser;
Eina_List *item;
- Elm_Code_Line *line;
-
- EINA_LIST_FOREACH(file-lines, item, line)
- {
-elm_code_line_tokens_clear(line);
-elm_code_line_status_clear(line);
- }
EINA_LIST_FOREACH(code-parsers, item, parser)
{
--
[EGIT] [tools/erigo] master 01/01: Fix and clean cmake files
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=6a1f0aa5476f139fb2fb969ee60cfcedada5be94
commit 6a1f0aa5476f139fb2fb969ee60cfcedada5be94
Author: Yakov Goldberg yako...@samsung.com
Date: Mon Apr 6 15:21:13 2015 +0300
Fix and clean cmake files
Try to detect libraries which are in libc on some distributions.
If it wasn't found, suppose it will be linked correctrly.
Thanks to Gleb Popov from FreeBSD community.
---
CMakeLists.txt | 35 ++-
src/bin/CMakeLists.txt | 1 -
src/bin/egui_gui/CMakeLists.txt | 3 +--
src/lib/CMakeLists.txt | 4 ++--
src/tests/CMakeLists.txt| 4 ++--
5 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4781800..7d94329 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,9 +25,42 @@ find_package(Efl REQUIRED)
find_package(Edje REQUIRED)
find_package(Elementary 1.13.0 REQUIRED)
find_package(Ffi REQUIRED)
-
+find_package(Threads)
include(EFLCheck)
+###
+## Some of following libraries are included into libc on different
distributions.
+## So try to locate them.
+## If library not found, supposing that it is included somethere.
+###
+#finding dl library
+find_library(DL dl)
+if(${DL} STREQUAL DL-NOTFOUND)
+ set(DL_LIBRARY )
+else()
+ set(DL_LIBRARY ${DL})
+endif()
+mark_as_advanced(DL_LIBRARY)
+
+#finding m library
+find_library(M m)
+if(${M} STREQUAL M-NOTFOUND)
+ set(M_LIBRARY )
+else()
+ set(M_LIBRARY ${M})
+endif()
+mark_as_advanced(M_LIBRARY)
+
+#finding rt library
+find_library(RT rt)
+if(${RT} STREQUAL RT-NOTFOUND)
+ set(RT_LIBRARY )
+else()
+ set(RT_LIBRARY ${RT})
+endif()
+mark_as_advanced(RT_LIBRARY)
+##
+
# uninstall target
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index 708405f..b2797b0 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -27,7 +27,6 @@ target_link_libraries (${TARGET}
${EVAS_LIBRARIES}
${ELEMENTARY_LIBRARIES}
ecore_file
- pthread
)
# Save current dir because we want to know path to soutce file to build erigo
diff --git a/src/bin/egui_gui/CMakeLists.txt b/src/bin/egui_gui/CMakeLists.txt
index 509e135..d8e4bd7 100644
--- a/src/bin/egui_gui/CMakeLists.txt
+++ b/src/bin/egui_gui/CMakeLists.txt
@@ -81,14 +81,13 @@ target_link_libraries (${TARGET}
guiparser
${EINA_LIBRARIES}
${ECORE_LIBRARIES}
+ ${EFL_LIBRARIES}
${EVAS_LIBRARIES}
${EDJE_LIBRARIES}
${ELEMENTARY_LIBRARIES}
${GVC_LIBRARIES}
${CGRAPH_LIBRARIES}
ecore_file
- efl
- pthread
)
install(TARGETS ${TARGET} DESTINATION bin)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 8236393..931fa74 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -70,8 +70,8 @@ target_link_libraries(guiparser
${FFI_LIBRARIES}
ecore_file
ecore_input
- m
- dl
+ ${M_LIBRARY}
+ ${DL_LIBRARY}
)
set_property(TARGET guiparser
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 7ce0066..1e4ee16 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -29,8 +29,8 @@ target_link_libraries(suite
${EINA_LIBRARIES}
${ELEMENTARY_LIBRARIES}
${CHECK_LIBRARIES}
- rt
- pthread
+ ${RT_LIBRARY}
+ ${CMAKE_THREAD_LIBS_INIT}
)
add_test(Erigo_Test_Suite suite)
--
[EGIT] [bindings/python/python-efl] master 02/03: New 1.14 function: Elm.Transit.go_in()
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=6fbe0ba320cda32a47201a5f152bfbff5af39002 commit 6fbe0ba320cda32a47201a5f152bfbff5af39002 Author: Dave Andreoli d...@gurumeditation.it Date: Sun Apr 12 12:49:43 2015 +0200 New 1.14 function: Elm.Transit.go_in() with test --- efl/elementary/transit.pxd | 1 + efl/elementary/transit.pyx | 10 ++ examples/elementary/test_transit.py | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/efl/elementary/transit.pxd b/efl/elementary/transit.pxd index 4e40a5b..3866b8a 100644 --- a/efl/elementary/transit.pxd +++ b/efl/elementary/transit.pxd @@ -67,6 +67,7 @@ cdef extern from Elementary.h: void elm_transit_duration_set(Elm_Transit *transit, double duration) double elm_transit_duration_get(Elm_Transit *transit) void elm_transit_go(Elm_Transit *transit) +void elm_transit_go_in(Elm_Transit *transit, double seconds) void elm_transit_paused_set(Elm_Transit *transit, Eina_Bool paused) Eina_Boolelm_transit_paused_get(Elm_Transit *transit) double elm_transit_progress_value_get(Elm_Transit *transit) diff --git a/efl/elementary/transit.pyx b/efl/elementary/transit.pyx index d71be84..0cd6035 100644 --- a/efl/elementary/transit.pyx +++ b/efl/elementary/transit.pyx @@ -618,6 +618,16 @@ cdef class Transit(object): elm_transit_go(self.obj) +def go_in(self, seconds): +Starts the transition in given seconds. + +:param float seconds: The interval value in seconds + +.. versionadded:: 1.14 + + +elm_transit_go_in(self.obj, seconds) + property paused: Pause/Resume the transition. diff --git a/examples/elementary/test_transit.py b/examples/elementary/test_transit.py index 7a0bfca..86709d7 100644 --- a/examples/elementary/test_transit.py +++ b/examples/elementary/test_transit.py @@ -69,8 +69,8 @@ def transit_wipe(obj): trans.effect_wipe_add(ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE, ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT) -trans.duration = 5.0 -trans.go() +trans.duration = 2.0 +trans.go_in(3.0) def transit_del_cb(transit, *args, **kwargs): obj = args[0] @@ -182,7 +182,7 @@ def transit_clicked(obj, item=None): bt.show() bt.callback_clicked_add(transit_rotation_color) -bt = Button(win, text=Wipe Effect, size_hint_weight=EXPAND_BOTH) +bt = Button(win, text=Wipe Effect (in 3 sec), size_hint_weight=EXPAND_BOTH) bx.pack_end(bt) bt.show() bt.callback_clicked_add(transit_wipe) --
[EGIT] [tools/erigo] master 01/01: Cleanup. Put some commands under if
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=c2bd4341ec7b7dda72b1276bb7c47bcb0c5c1150
commit c2bd4341ec7b7dda72b1276bb7c47bcb0c5c1150
Author: Yakov Goldberg yako...@samsung.com
Date: Sun Apr 12 13:53:15 2015 +0300
Cleanup. Put some commands under if
---
src/bin/egui_gui/editor.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 6a556ce..9ca8726 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -1427,19 +1427,17 @@ _drop_target_main_wdg_enter(void *data, Evas_Object
*obj)
ERR(Drop target is wrong. If you see this message something is
terribly wrong!);
}
- const Eo_Class* (*kl_func)();
- const char * _drag_data = dnd_drag_data_get(), *drag_obj_class_name;
- const Gui_Widget *dragged_wdg = dnd_drag_wdg_get();
-
if (!di-eo_cur)
{
+const Gui_Widget *dragged_wdg = dnd_drag_wdg_get();
if (dragged_wdg)
{
di-eo_cur = dnd_drag_obj_create(dragged_wdg, canvas);
}
else
{
- drag_obj_class_name = _drag_data;
+ const char *drag_obj_class_name = dnd_drag_data_get();
+ const Eo_Class* (*kl_func)();
kl_func = db_class_func_get(drag_obj_class_name);
if (!strcmp(drag_obj_class_name, DB_DEF_WIN_CLASS))
{
--
[EGIT] [tools/edi] master 02/07: clang: remove debugging
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=c0654b6c4e082f8489060c2875a46aeb28d0001a
commit c0654b6c4e082f8489060c2875a46aeb28d0001a
Author: Andy Williams a...@andywilliams.me
Date: Sun Apr 12 16:47:53 2015 +0100
clang: remove debugging
---
src/bin/editor/clang_debug.h | 198 ---
src/bin/editor/edi_editor.c | 28 +-
2 files changed, 1 insertion(+), 225 deletions(-)
diff --git a/src/bin/editor/clang_debug.h b/src/bin/editor/clang_debug.h
deleted file mode 100644
index 7a9e6c6..000
--- a/src/bin/editor/clang_debug.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#ifndef _CLANG_DEBUG_H
-#define _CLANG_DEBUG_H
-#include clang-c/Index.h
-
-static void PrintExtent(FILE *out, unsigned begin_line, unsigned begin_column,
-unsigned end_line, unsigned end_column) {
- fprintf(out, [%d:%d - %d:%d], begin_line, begin_column,
- end_line, end_column);
-}
-
-static void PrintRange(CXSourceRange R, const char *str) {
- CXFile begin_file, end_file;
- unsigned begin_line, begin_column, end_line, end_column;
-
- clang_getSpellingLocation(clang_getRangeStart(R),
-begin_file, begin_line, begin_column, 0);
- clang_getSpellingLocation(clang_getRangeEnd(R),
-end_file, end_line, end_column, 0);
- if (!begin_file || !end_file)
-return;
-
- if (str)
-printf( %s=, str);
- PrintExtent(stdout, begin_line, begin_column, end_line, end_column);
-}
-
-void PrintToken(CXTranslationUnit tx, CXToken token)
-{
- CXString str = clang_getTokenSpelling(tx, token);
- PrintRange(clang_getTokenExtent(tx, token), clang_getCString(str));
- clang_disposeString(str);
-}
-
-int want_display_name = 0;
-
-void PrintCursor(CXCursor Cursor) {
- CXTranslationUnit TU = clang_Cursor_getTranslationUnit(Cursor);
- if (clang_isInvalid(Cursor.kind)) {
-CXString ks = clang_getCursorKindSpelling(Cursor.kind);
-printf(Invalid Cursor = %s, clang_getCString(ks));
-clang_disposeString(ks);
- }
- else {
-CXString string, ks;
-CXCursor Referenced;
-unsigned line, column;
-CXCursor SpecializationOf;
-CXCursor *overridden;
-unsigned num_overridden;
-unsigned RefNameRangeNr;
-CXSourceRange CursorExtent;
-CXSourceRange RefNameRange;
-
-ks = clang_getCursorKindSpelling(Cursor.kind);
-string = want_display_name? clang_getCursorDisplayName(Cursor)
- : clang_getCursorSpelling(Cursor);
-printf(%s=%s, clang_getCString(ks),
-clang_getCString(string));
-clang_disposeString(ks);
-clang_disposeString(string);
-
-Referenced = clang_getCursorReferenced(Cursor);
-if (!clang_equalCursors(Referenced, clang_getNullCursor())) {
- if (clang_getCursorKind(Referenced) == CXCursor_OverloadedDeclRef) {
-unsigned I, N = clang_getNumOverloadedDecls(Referenced);
-printf([);
-for (I = 0; I != N; ++I) {
- CXCursor Ovl = clang_getOverloadedDecl(Referenced, I);
- CXSourceLocation Loc;
- if (I)
-printf(, );
-
- Loc = clang_getCursorLocation(Ovl);
- clang_getSpellingLocation(Loc, 0, line, column, 0);
- printf(%d:%d, line, column);
-}
-printf(]);
- } else {
-CXFile cfile;
-CXSourceLocation Loc = clang_getCursorLocation(Referenced);
-clang_getSpellingLocation(Loc, cfile, line, column, 0);
-CXString str = clang_getFileName(cfile);
-printf(:%s:%d:%d, clang_getCString(str), line, column);
-clang_disposeString(str);
- }
-}
-
-if (clang_isCursorDefinition(Cursor))
- printf( (Definition));
-
-switch (clang_getCursorAvailability(Cursor)) {
- case CXAvailability_Available:
-break;
-
- case CXAvailability_Deprecated:
-printf( (deprecated));
-break;
-
- case CXAvailability_NotAvailable:
-printf( (unavailable));
-break;
-
- case CXAvailability_NotAccessible:
-printf( (inaccessible));
-break;
-}
-
-if (clang_CXXMethod_isStatic(Cursor))
- printf( (static));
-if (clang_CXXMethod_isVirtual(Cursor))
- printf( (virtual));
-
-if (Cursor.kind == CXCursor_IBOutletCollectionAttr) {
- CXType T =
-clang_getCanonicalType(clang_getIBOutletCollectionType(Cursor));
- CXString S = clang_getTypeKindSpelling(T.kind);
- printf( [IBOutletCollection=%s], clang_getCString(S));
- clang_disposeString(S);
-}
-
-if (Cursor.kind == CXCursor_CXXBaseSpecifier) {
- enum CX_CXXAccessSpecifier access = clang_getCXXAccessSpecifier(Cursor);
- unsigned isVirtual = clang_isVirtualBase(Cursor);
- const char *accessStr = 0;
-
- switch (access) {
-case CX_CXXInvalidAccessSpecifier:
- accessStr = invalid; break;
-
