[EGIT] [admin/devs] master 01/01: Update keys

[Daniel Zaoui]

jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/admin/devs.git/commit/?id=0611b836c19960d609a3904b1d06c14d3cf3bd36

commit 0611b836c19960d609a3904b1d06c14d3cf3bd36
Author: Daniel Zaoui 
Date:   Mon Sep 12 08:55:43 2016 +0300

Update keys
---
 developers/jackdanielz/id_rsa.pub | 2 +-
 developers/jackdanielz/id_rsa_home.pub| 1 -
 developers/jackdanielz/{id_rsa.pub => id_rsa_old.pub} | 0
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/developers/jackdanielz/id_rsa.pub 
b/developers/jackdanielz/id_rsa.pub
index ead8b4e..e42ff3a 100644
--- a/developers/jackdanielz/id_rsa.pub
+++ b/developers/jackdanielz/id_rsa.pub
@@ -1 +1 @@
-ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDMF9Y8waRa9O9ZiNiEpz2pBRbkQJ2gGmcw3ut5EyUzIC3J8wsQLdjgJv/uMqhWIUQIYl8wk3C5rpoffQDACzd6IwcUj3PL1e5C9d8r8OOQVMst5/6Rscm8N6RopNgQPlhI6K4q5u7+UsYimLzPMYFUZ5SWuRY6a8lPNmcpmXDyCowBrhAYsg5rvOPsYXGUhNSTWgTGhBqUZr+wr1/Ls5y+qZD2kBNrOAoMh7jZBqWXxbQlVBRXy26t43EFGvljBEeZl2QRMDtVbyBUpspbUfdOoofTNAfPHRtLHP25COevLhxaLK4BrRVVHB6RlN4tCKmUwZvGtcQIBCzPXoNOfanf
 daniel@daniel-laptop
+ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCxpY9nocShTZLkvHp0Z+iOA+nzANP9adccK9DSI0MdIlyROKhl9Xkrm/9IEsn8xKKxphqAfLVYDY276wzAhNmIBIUglBFwUlRPM23hcksP0CXerKERosoJVMC+hzdcwqxkgDJ6DUJkYnuKYqzIuOuFZYNGM8bFG+oltl8+67iqpjyXNX8sGZQcpWQ1duPXX2NGRfiXk1eEWnaMbU7aVvlj0dTx2QgBYEtLThh12OuCLbH5Z1zNYkV7B74PqGcjoLOFr5MNHF16OFSiu2SUkn8erQiZBjhPGxK/LXzj4VJeVROktsjtTI5+ZuFM11HaIz4Fblhs2lNqjFeQhpgg8zc3
 daniel@JackDanielZ
diff --git a/developers/jackdanielz/id_rsa_home.pub 
b/developers/jackdanielz/id_rsa_home.pub
deleted file mode 100644
index 07fbce3..000
--- a/developers/jackdanielz/id_rsa_home.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDBu6sGSeX56lerGulRBePfnuVYIzl/GiBMpq5xcJoTBsdT5BxNivBc2qBm52MUwKmr+9F4+eeszxfPFDqJD4UXkH1aosz8iWlgSEO3ZLDBqgVYdtgj+pXHpg686hh9t1Gnb8aiQ0ZnnIfRibnt4m7qJr6jffKIkDLxLEXNxYcqrjT2Exgd5MzJqXjWpKOcePpDW+PHZOhqD2V7pTkPwCH6UJUtz3UBUnY48GIzKuEXbkhAjENdk8ufIVtCFPY/7ej88JMGSjnHeJsi3a0q7YKYa0bVYr615vtyGB/PSfGjocpQG6nscUMyU4T3OV159fcF6tVhyKl4yjDUUvHU2VDP
 daniel@Ubuntu
diff --git a/developers/jackdanielz/id_rsa.pub 
b/developers/jackdanielz/id_rsa_old.pub
similarity index 100%
copy from developers/jackdanielz/id_rsa.pub
copy to developers/jackdanielz/id_rsa_old.pub

-- 

[EGIT] [core/efl] master 01/01: elementary test_glview: guide ELM_ACCEL rather than ELM_ENGINE

[ChunEon Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ffe53365065d043e4ddf302fcbc02c988fac3430

commit ffe53365065d043e4ddf302fcbc02c988fac3430
Author: Hermet Park 
Date:   Mon Sep 12 13:09:17 2016 +0900

elementary test_glview: guide ELM_ACCEL rather than ELM_ENGINE

Specifying explicit engine name is not honored now
because backened engine name depends on the system.
We prefer to guide accelerator rather than engine.
---
 src/bin/elementary/test_glview.c   | 2 +-
 src/bin/elementary/test_glview_manygears.c | 2 +-
 src/bin/elementary/test_glview_simple.c| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/elementary/test_glview.c b/src/bin/elementary/test_glview.c
index 72bb0bf..2b68a73 100644
--- a/src/bin/elementary/test_glview.c
+++ b/src/bin/elementary/test_glview.c
@@ -703,7 +703,7 @@ test_glview(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_in
 elm_object_text_set(lb, 

[EGIT] [core/efl] master 01/01: eolian-cxx: Implement future template class for C++

[Felipe Magno de Almeida]

felipealmeida pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=a63cfcafc7f8524dfad4e1bba763fb17c69d50e1

commit a63cfcafc7f8524dfad4e1bba763fb17c69d50e1
Author: Felipe Magno de Almeida 
Date:   Sun Aug 7 16:52:48 2016 -0300

eolian-cxx: Implement future template class for C++
---
 src/Makefile_Cxx.am|  34 +-
 src/Makefile_Ecore.am  |  13 +-
 src/Makefile_Eolian_Cxx.am |   4 +-
 src/bindings/cxx/ecore_cxx/Ecore.hh| 164 +---
 .../cxx/ecore_cxx/{Ecore.hh => Ecore_Manual.hh}|  10 +-
 src/bindings/cxx/eina_cxx/Eina.hh  |   1 +
 src/bindings/cxx/eina_cxx/eina_copy_traits.hh  |  43 +++
 src/bindings/cxx/eo_cxx/Eo.hh  |   3 +-
 src/bindings/cxx/eo_cxx/eo_cxx_interop.hh  |  34 +-
 src/bindings/cxx/eo_cxx/eo_promise.hh  | 416 +
 src/lib/eolian_cxx/grammar/type_impl.hpp   |   8 +-
 src/tests/eo_cxx/eo_cxx_suite.cc   |  27 ++
 src/tests/eo_cxx/eo_cxx_suite.h|  11 +
 src/tests/eo_cxx/eo_cxx_test_promise.cc| 347 +
 14 files changed, 923 insertions(+), 192 deletions(-)

diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
index 2fda128..917d285 100644
--- a/src/Makefile_Cxx.am
+++ b/src/Makefile_Cxx.am
@@ -13,6 +13,7 @@ bindings/cxx/eo_cxx/Eo.hh \
 bindings/cxx/eo_cxx/eo_init.hh \
 bindings/cxx/eo_cxx/eo_ops.hh \
 bindings/cxx/eo_cxx/eo_wref.hh \
+bindings/cxx/eo_cxx/eo_promise.hh \
 bindings/cxx/eo_cxx/eo_private.hh
 
 ### Elementary C++
@@ -120,7 +121,8 @@ CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl) 
lib/edje/Edje.hh
 ### Ecore src/lib/ecore
 installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@
 dist_installed_ecorecxxheaders_DATA = \
-bindings/cxx/ecore_cxx/Ecore.hh
+bindings/cxx/ecore_cxx/Ecore.hh \
+bindings/cxx/ecore_cxx/Ecore_Manual.hh
 nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) 
$(ecore_eolian_cxx_impl) \
 lib/ecore/Ecore.eo.hh
 
@@ -168,6 +170,7 @@ bindings/cxx/eina_cxx/eina_tuple_unwrap.hh \
 bindings/cxx/eina_cxx/eina_type_traits.hh \
 bindings/cxx/eina_cxx/eina_value.hh \
 bindings/cxx/eina_cxx/eina_workarounds.hh \
+bindings/cxx/eina_cxx/eina_copy_traits.hh \
 bindings/cxx/eina_cxx/Eina.hh
 
 ### Eio
@@ -186,9 +189,9 @@ CLEANFILES += $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl) 
lib/eio/Eio.hh
 
 if EFL_ENABLE_TESTS
 
-### Tests for Eina
-check_PROGRAMS += tests/eina_cxx/eina_cxx_suite
-TESTS += tests/eina_cxx/eina_cxx_suite
+### Tests for Eina and Eo
+check_PROGRAMS += tests/eina_cxx/eina_cxx_suite tests/eo_cxx/eo_cxx_suite
+TESTS += tests/eina_cxx/eina_cxx_suite tests/eo_cxx/eo_cxx_suite
 
 tests_eina_cxx_eina_cxx_suite_SOURCES = \
 tests/eina_cxx/eina_cxx_suite.cc \
@@ -232,11 +235,34 @@ tests_eina_cxx_eina_cxx_suite_CPPFLAGS = 
-I$(top_builddir)/src/lib/efl \
 @CHECK_CFLAGS@ \
 @EO_CFLAGS@ \
 @ECORE_CFLAGS@ \
+@ECORE_CXX_CFLAGS@ \
 @EO_CXX_CFLAGS@ \
 @EINA_CXX_CFLAGS@
 tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ 
@USE_EO_LIBS@
 tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ 
@USE_EO_INTERNAL_LIBS@
 
+tests_eo_cxx_eo_cxx_suite_SOURCES = \
+tests/eo_cxx/eo_cxx_suite.cc \
+tests/eo_cxx/eo_cxx_test_promise.cc
+
+tests_eo_cxx_eo_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DTESTS_WD=\"`pwd`\" \
+-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eo_cxx\" \
+-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eo_cxx\" \
+-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eo_cxx\" \
+-I$(top_builddir)/src/lib/efl \
+-I$(top_builddir)/src/lib/efl/interfaces \
+-I$(top_srcdir)/src/bin/eina_cxx \
+-I$(top_builddir)/src/tests/eina_cxx \
+@CHECK_CFLAGS@ \
+@EO_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_CXX_CFLAGS@ \
+@EO_CXX_CFLAGS@ \
+@EINA_CXX_CFLAGS@
+tests_eo_cxx_eo_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@ 
@USE_ECORE_LIBS@
+tests_eo_cxx_eo_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ 
@USE_EO_INTERNAL_LIBS@ @USE_ECORE_INTERNAL_LIBS@
+
 ### Tests for ecore
 
 check_PROGRAMS += tests/ecore_cxx/ecore_cxx_suite 
tests/ecore_cxx/cxx_compile_test
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 4a1d6a6..606ae66 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -6,7 +6,7 @@ ecore_eolian_files_legacy = \
lib/ecore/ecore_exe.eo \
lib/ecore/efl_loop_timer.eo
 
-ecore_eolian_files = \
+ecore_eolian_files_public = \
lib/ecore/efl_loop.eo \
lib/ecore/efl_loop_user.eo \
lib/ecore/efl_loop_fd.eo \
@@ -20,8 +20,11 @@ ecore_eolian_files = \
lib/ecore/efl_io_stderr.eo \
lib/ecore/efl_io_file.eo \
 lib/ecore/efl_io_copier.eo \
+   lib/ecore/ecore_parent.eo
+
+ecore_eolian_files = \
+   $(ecore_eolian_files_public) \
lib/ecore/efl_promise.eo \
-   lib/ecore/ecore_parent.eo \
   

[EGIT] [core/efl] master 01/01: embryo_cc: fix memory overflow in str

[WooHyun Jung]

woohyun pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=98229bc5d6cf1ebe11af4bb05a32f2a30b470f6e

commit 98229bc5d6cf1ebe11af4bb05a32f2a30b470f6e
Author: WooHyun Jung 
Date:   Mon Sep 12 10:09:32 2016 +0900

embryo_cc: fix memory overflow in str

After for-loop i can have value 11. So the str should be longer than 11.

@fix
---
 src/bin/embryo/embryo_cc_sc7.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/embryo/embryo_cc_sc7.c b/src/bin/embryo/embryo_cc_sc7.c
index 00e0252..db4fa69 100644
--- a/src/bin/embryo/embryo_cc_sc7.c
+++ b/src/bin/embryo/embryo_cc_sc7.c
@@ -454,7 +454,7 @@ matchsequence(char *start, char *end, char *pattern,
  char symbols[_maxoptvars][_aliasmax + 1], int *match_length)
 {
int var, i;
-   charstr[_aliasmax + 1];
+   charstr[_aliasmax + 2];
char   *start_org = start;
 
*match_length = 0;

-- 

[EGIT] [tools/edi] master 01/01: ui: only use help lookup if control pressed

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=1578481d469a892bf3cc19979dfac164a4d0b9f8

commit 1578481d469a892bf3cc19979dfac164a4d0b9f8
Author: Andy Williams 
Date:   Sun Sep 11 19:17:21 2016 +0100

ui: only use help lookup if control pressed
---
 src/bin/editor/edi_editor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 70ebba8..7222862 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -473,6 +473,7 @@ _mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Elm_Code_Widget *widget;
Evas_Object *popup;
Evas_Event_Mouse_Up *event;
+   Eina_Bool ctrl;
unsigned int row;
int col;
const char *word;
@@ -480,7 +481,8 @@ _mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
widget = (Elm_Code_Widget *)data;
event = (Evas_Event_Mouse_Up *)event_info;
 
-   if (event->button != 3)
+   ctrl = evas_key_modifier_is_set(event->modifiers, "Control");
+   if (event->button != 3 || !ctrl)
  return;
 
elm_code_widget_position_at_coordinates_get(widget, event->canvas.x, 
event->canvas.y, , );

-- 

[EGIT] [core/efl] master 02/02: elm: don't show our elm_code popup if ctrl pressed

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2598ea8da83a084b5a376ca8837ff199c21393a8

commit 2598ea8da83a084b5a376ca8837ff199c21393a8
Author: Andy Williams 
Date:   Sun Sep 11 19:10:04 2016 +0100

elm: don't show our elm_code popup if ctrl pressed
---
 src/lib/elementary/elm_code_widget.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index 1406254..a54bfb9 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -863,6 +863,7 @@ _elm_code_widget_mouse_down_cb(void *data, Evas *e 
EINA_UNUSED, Evas_Object *obj
Elm_Code_Widget *widget;
Elm_Code_Widget_Data *pd;
Evas_Event_Mouse_Down *event;
+   Eina_Bool ctrl;
unsigned int row;
int col;
 
@@ -871,7 +872,8 @@ _elm_code_widget_mouse_down_cb(void *data, Evas *e 
EINA_UNUSED, Evas_Object *obj
event = (Evas_Event_Mouse_Down *)event_info;
_elm_code_widget_position_at_coordinates_get(widget, pd, event->canvas.x, 
event->canvas.y, , );
 
-   if (event->button == 3)
+   ctrl = evas_key_modifier_is_set(event->modifiers, "Control");
+   if (event->button == 3 && !ctrl)
  {
 _popup_menu_show(widget, event->canvas.x, event->canvas.y);
 return;

-- 

[EGIT] [core/efl] master 01/02: elm: Add popup edit menu in elm_code

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=a4398fffef244bc8e45d3f208b688a0d3222cd39

commit a4398fffef244bc8e45d3f208b688a0d3222cd39
Author: Andy Williams 
Date:   Sun Sep 11 18:47:05 2016 +0100

elm: Add popup edit menu in elm_code
---
 src/lib/elementary/elm_code_widget.c | 143 +++
 src/lib/elementary/elm_code_widget_private.h |   2 +
 2 files changed, 145 insertions(+)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index 0aadfb6..1406254 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -663,6 +663,143 @@ _elm_code_widget_status_toggle(Elm_Code_Widget *widget, 
Elm_Code_Line *line)
 }
 
 static void
+_popup_menu_dismissed_cb(void *data, const Efl_Event *event EINA_UNUSED)
+{
+   Elm_Code_Widget *widget;
+   Elm_Code_Widget_Data *pd;
+
+   widget = (Elm_Code_Widget *)data;
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+
+   if (pd->hoversel) evas_object_hide(pd->hoversel);
+}
+
+static void
+_popup_menu_cut_cb(void *data,
+Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
+{
+   Elm_Code_Widget *widget;
+   Elm_Code_Widget_Data *pd;
+
+   widget = (Elm_Code_Widget *)data;
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+
+   elm_code_widget_selection_cut(widget);
+   if (pd->hoversel) evas_object_hide(pd->hoversel);
+}
+
+static void
+_popup_menu_copy_cb(void *data,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+   Elm_Code_Widget *widget;
+   Elm_Code_Widget_Data *pd;
+
+   widget = (Elm_Code_Widget *)data;
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+
+   elm_code_widget_selection_copy(widget);
+   if (pd->hoversel) evas_object_hide(pd->hoversel);
+}
+
+static void
+_popup_menu_paste_cb(void *data,
+  Evas_Object *obj EINA_UNUSED,
+  void *event_info EINA_UNUSED)
+{
+   Elm_Code_Widget *widget;
+   Elm_Code_Widget_Data *pd;
+
+   widget = (Elm_Code_Widget *)data;
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+
+   elm_code_widget_selection_paste(widget);
+   if (pd->hoversel) evas_object_hide(pd->hoversel);
+}
+
+static void
+_popup_menu_cancel_cb(void *data,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+   Elm_Code_Widget *widget;
+   Elm_Code_Widget_Data *pd;
+
+   widget = (Elm_Code_Widget *)data;
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+
+   elm_code_widget_selection_clear(widget);
+   if (pd->hoversel) evas_object_hide(pd->hoversel);
+}
+
+static void
+_popup_menu_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   Elm_Code_Widget *widget;
+   Elm_Code_Widget_Data *pd;
+   Evas_Object *top;
+
+   widget = (Elm_Code_Widget *)obj;
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+
+   if (pd->hoversel) evas_object_del(pd->hoversel);
+
+   pd->hoversel = elm_hoversel_add(obj);
+   elm_widget_sub_object_add(obj, pd->hoversel);
+   top = elm_widget_top_get(obj);
+
+   if (top) elm_hoversel_hover_parent_set(pd->hoversel, top);
+
+   efl_event_callback_add
+ (pd->hoversel, ELM_HOVERSEL_EVENT_DISMISSED, _popup_menu_dismissed_cb, 
obj);
+   if (pd->selection)
+ {
+if (pd->editable)
+  {
+ elm_hoversel_item_add
+(pd->hoversel, "Cut", NULL, ELM_ICON_NONE,
+ _popup_menu_cut_cb, obj);
+  }
+elm_hoversel_item_add
+   (pd->hoversel, "Copy", NULL, ELM_ICON_NONE,
+_popup_menu_copy_cb, obj);
+if (pd->editable)
+  {
+ elm_hoversel_item_add
+(pd->hoversel, "Paste", NULL, ELM_ICON_NONE,
+ _popup_menu_paste_cb, obj);
+  }
+elm_hoversel_item_add
+  (pd->hoversel, "Cancel", NULL, ELM_ICON_NONE,
+   _popup_menu_cancel_cb, obj);
+ }
+   else
+ {
+if (pd->editable)
+  {
+ if (pd->editable)
+   elm_hoversel_item_add
+ (pd->hoversel, "Paste", NULL, ELM_ICON_NONE,
+ _popup_menu_paste_cb, obj);
+
+  }
+else
+  elm_hoversel_item_add
+ (pd->hoversel, "Cancel", NULL, ELM_ICON_NONE,
+  _popup_menu_cancel_cb, obj);
+ }
+
+   if (pd->hoversel)
+ {
+evas_object_move(pd->hoversel, x, y);
+evas_object_show(pd->hoversel);
+elm_hoversel_hover_begin(pd->hoversel);
+ }
+}
+
+static void
 _elm_code_widget_clicked_gutter_cb(Elm_Code_Widget *widget, unsigned int row)
 {
Elm_Code_Widget_Data *pd;
@@ -734,6 +871,12 @@ _elm_code_widget_mouse_down_cb(void *data, Evas *e 
EINA_UNUSED, Evas_Object *obj
event = (Evas_Event_Mouse_Down *)event_info;
_elm_code_widget_position_at_coordinates_get(widget, pd, event->canvas.x, 
event->canvas.y, , );
 
+   if 

[EGIT] [core/efl] master 01/01: Ecore_con_ssl: fix return value of ecore_con_ssl_client_upgrade.

[Mykyta Biliavskyi]

nikawhite pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3ba73e58f5903f58621fae2f3dfe6f503c8536d7

commit 3ba73e58f5903f58621fae2f3dfe6f503c8536d7
Author: Mykyta Biliavskyi 
Date:   Sun Sep 11 20:15:50 2016 +0300

Ecore_con_ssl: fix return value of ecore_con_ssl_client_upgrade.

In case when _ecore_con_ssl_client_init_(gnutls/openssl) finished
successful a enum ECORE_CON_SSL_ERROR_NONE value (0) returned. Function
ecore_con_ssl_client_upgrade return Eina_Bool and in case of success
EINA_FALSE was returned.

@fix
---
 src/lib/ecore_con/ecore_con_ssl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/ecore_con/ecore_con_ssl.c 
b/src/lib/ecore_con/ecore_con_ssl.c
index 891467d..7297474 100644
--- a/src/lib/ecore_con/ecore_con_ssl.c
+++ b/src/lib/ecore_con/ecore_con_ssl.c
@@ -744,7 +744,7 @@ ecore_con_ssl_client_upgrade(Ecore_Con_Client *obj, 
Ecore_Con_Type ssl_type)
host_server->upgrade = EINA_TRUE;
cl->handshaking = EINA_TRUE;
cl->ssl_state = ECORE_CON_SSL_STATE_INIT;
-   return SSL_SUFFIX(_ecore_con_ssl_client_init) (obj);
+   return !SSL_SUFFIX(_ecore_con_ssl_client_init) (obj);
 }
 
 /**

-- 

[EGIT] [tools/edi] master 01/01: oops, fixing the right temporary code

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=61284cfa1a18fcf87a8ec3f025d1134488260e54

commit 61284cfa1a18fcf87a8ec3f025d1134488260e54
Author: Andy Williams 
Date:   Sun Sep 11 17:05:14 2016 +0100

oops, fixing the right temporary code
---
 src/bin/mainview/edi_mainview.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index d081c60..8dd82ac 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -207,13 +207,13 @@ _edi_mainview_content_create(Edi_Mainview_Item *item, 
Evas_Object *parent)
 static void
 _edi_mainview_item_tab_add(Edi_Path_Options *options, const char *mime)
 {
-   Evas_Object *content, *tab, *icon;
+   Evas_Object *content, *tab;//, *icon;
Edi_Mainview_Item *item;
Edi_Editor *editor;
 //   Edi_Content_Provider *provider;
 
item = _edi_mainview_item_add(options, mime, NULL, NULL, NULL);
-   provider = edi_content_provider_for_id_get(item->editortype);
+//   provider = edi_content_provider_for_id_get(item->editortype);
content = _edi_mainview_content_create(item, _content_frame);
 
_edi_mainview_view_show(content);

-- 

[EGIT] [tools/edi] master 01/01: ui: use the style from multibuttonentry for tabs

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=bbf388deae9b7f22ab497bf3a29a8fe557bc0833

commit bbf388deae9b7f22ab497bf3a29a8fe557bc0833
Author: Andy Williams 
Date:   Sun Sep 11 16:50:53 2016 +0100

ui: use the style from multibuttonentry for tabs

Icons not here temporarily...
---
 src/bin/mainview/edi_mainview.c | 59 +
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index b7824d9..d081c60 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -126,11 +126,39 @@ edi_mainview_item_select(Edi_Mainview_Item *item)
 }
 
 static void
-_promote(void *data, Evas_Object *obj EINA_UNUSED, void *event_info 
EINA_UNUSED)
+_edi_mainview_item_close(Edi_Mainview_Item *item)
+{
+   if (!item)
+ return;
+
+   edi_mainview_item_prev();
+   evas_object_del(item->view);
+   elm_box_unpack(tb, item->tab);
+   evas_object_del(item->tab);
+   _edi_mainview_items = eina_list_remove(_edi_mainview_items, item);
+
+   _edi_project_config_tab_remove(item->path);
+   eina_stringshare_del(item->path);
+   free(item);
+
+   if (eina_list_count(_edi_mainview_items) == 0)
+ _edi_mainview_view_show(_welcome_panel);
+}
+
+static void
+_promote(void *data, Evas_Object *obj EINA_UNUSED,
+ const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
_edi_mainview_view_show(data);
 }
 
+static void
+_closetab(void *data, Evas_Object *obj EINA_UNUSED,
+  const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
+{
+   _edi_mainview_item_close(data);
+}
+
 static Edi_Mainview_Item *
 _get_item_for_path(const char *path)
 {
@@ -182,7 +210,7 @@ _edi_mainview_item_tab_add(Edi_Path_Options *options, const 
char *mime)
Evas_Object *content, *tab, *icon;
Edi_Mainview_Item *item;
Edi_Editor *editor;
-   Edi_Content_Provider *provider;
+//   Edi_Content_Provider *provider;
 
item = _edi_mainview_item_add(options, mime, NULL, NULL, NULL);
provider = edi_content_provider_for_id_get(item->editortype);
@@ -195,11 +223,15 @@ _edi_mainview_item_tab_add(Edi_Path_Options *options, 
const char *mime)
evas_object_size_hint_weight_set(tab, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tab, 0.0, EVAS_HINT_FILL);
 
-   elm_object_text_set(tab, basename((char*)options->path));
+   elm_layout_theme_set(tab, "multibuttonentry", "btn", "default");
+   elm_object_part_text_set(tab, "elm.btn.text", 
basename((char*)options->path));
+/*
icon = elm_icon_add(tab);
elm_icon_standard_set(icon, provider->icon);
elm_object_part_content_set(tab, "icon", icon);
-   evas_object_smart_callback_add(tab, "clicked", _promote, content);
+*/
+   elm_layout_signal_callback_add(tab, "mouse,clicked,1", "*", _promote, 
content);
+   elm_layout_signal_callback_add(tab, "elm,deleted", "elm", _closetab, item);
 
elm_box_pack_end(tb, tab);
evas_object_show(tab);
@@ -310,25 +342,6 @@ _edi_mainview_choose_type_close_cb(void *data EINA_UNUSED,
 }
 
 static void
-_edi_mainview_item_close(Edi_Mainview_Item *item)
-{
-   if (!item)
- return;
-
-   edi_mainview_item_prev();
-   evas_object_del(item->view);
-   evas_object_del(item->tab);
-   _edi_mainview_items = eina_list_remove(_edi_mainview_items, item);
-
-   _edi_project_config_tab_remove(item->path);
-   eina_stringshare_del(item->path);
-   free(item);
-
-   if (eina_list_count(_edi_mainview_items) == 0)
- _edi_mainview_view_show(_welcome_panel);
-}
-
-static void
 _edi_mainview_filetype_create(Evas_Object *popup, const char *type, void *cb)
 {
Edi_Content_Provider *provider;

-- 

[EGIT] [tools/edi] master 02/02: Authors fix since Elm_Code merged to efl

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=74a121cfd53f5bf0735904b19a1a87cce500a905

commit 74a121cfd53f5bf0735904b19a1a87cce500a905
Author: Andy Williams 
Date:   Sun Sep 11 14:00:47 2016 +0100

Authors fix since Elm_Code merged to efl
---
 AUTHORS | 4 
 1 file changed, 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7d1ab11..0cadb21 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,7 +8,3 @@ With sections from Ecrire by Tom Hacohen 
 Clang syntax higlighting from cedric and TAsn in the edi PROTO project
 
 
-Elm_Code module (which will be extracted at some point) by:
-
-ajwillia.ms (Andy Williams) 
-

-- 

[EGIT] [tools/edi] master 01/02: ui: drop toolbar for tabs, start rolling my own

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=f0d3c268086ccda488eca17e742451d1d748ad5d

commit f0d3c268086ccda488eca17e742451d1d748ad5d
Author: Andy Williams 
Date:   Sun Sep 11 14:00:31 2016 +0100

ui: drop toolbar for tabs, start rolling my own
---
 src/bin/mainview/edi_mainview.c | 29 +
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index 964c708..b7824d9 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -179,8 +179,7 @@ _edi_mainview_content_create(Edi_Mainview_Item *item, 
Evas_Object *parent)
 static void
 _edi_mainview_item_tab_add(Edi_Path_Options *options, const char *mime)
 {
-   Evas_Object *content;
-   Elm_Object_Item *tab;
+   Evas_Object *content, *tab, *icon;
Edi_Mainview_Item *item;
Edi_Editor *editor;
Edi_Content_Provider *provider;
@@ -192,7 +191,18 @@ _edi_mainview_item_tab_add(Edi_Path_Options *options, 
const char *mime)
_edi_mainview_view_show(content);
item->view = content;
 
-   tab = elm_toolbar_item_append(tb, provider->icon, 
basename((char*)options->path), _promote, content);
+   tab = elm_button_add(tb);
+   evas_object_size_hint_weight_set(tab, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(tab, 0.0, EVAS_HINT_FILL);
+
+   elm_object_text_set(tab, basename((char*)options->path));
+   icon = elm_icon_add(tab);
+   elm_icon_standard_set(icon, provider->icon);
+   elm_object_part_content_set(tab, "icon", icon);
+   evas_object_smart_callback_add(tab, "clicked", _promote, content);
+
+   elm_box_pack_end(tb, tab);
+   evas_object_show(tab);
item->tab = tab;
elm_toolbar_item_selected_set(tab, EINA_TRUE);
 
@@ -307,7 +317,7 @@ _edi_mainview_item_close(Edi_Mainview_Item *item)
 
edi_mainview_item_prev();
evas_object_del(item->view);
-   elm_object_item_del(item->tab);
+   evas_object_del(item->tab);
_edi_mainview_items = eina_list_remove(_edi_mainview_items, item);
 
_edi_project_config_tab_remove(item->path);
@@ -458,7 +468,6 @@ edi_mainview_open_window(Edi_Path_Options *options)
  {
 edi_mainview_item_select(it);
 _edi_mainview_item_close(it);
-elm_object_item_del(elm_toolbar_selected_item_get(tb));
 _edi_mainview_items = eina_list_remove(_edi_mainview_items, it);
 
 eina_stringshare_del(it->path);
@@ -677,14 +686,10 @@ edi_mainview_add(Evas_Object *parent, Evas_Object *win)
evas_object_show(box);
elm_box_pack_end(parent, box);
 
-   tb = elm_toolbar_add(parent);
+   tb = elm_box_add(parent);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, 0.0);
-   evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_toolbar_homogeneous_set(tb, EINA_FALSE);
-   elm_toolbar_icon_size_set(tb, 20);
-   elm_object_style_set(tb, "item_horizontal");
-   elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_MENU);
-   elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_ALWAYS);
+   evas_object_size_hint_align_set(tb, 0.0, EVAS_HINT_FILL);
+   elm_box_horizontal_set(tb, EINA_TRUE);
elm_box_pack_end(box, tb);
evas_object_show(tb);
 

-- 

[EGIT] [tools/exactness] master 01/01: Fix compilation after Emile API change

[Daniel Zaoui]

jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/tools/exactness.git/commit/?id=fefa31d7b206315da76be16b9d53a54602fa2cd8

commit fefa31d7b206315da76be16b9d53a54602fa2cd8
Author: Daniel Zaoui 
Date:   Sun Sep 11 13:14:03 2016 +0300

Fix compilation after Emile API change
---
 src/bin/run_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/run_test.c b/src/bin/run_test.c
index eae5d8f..7fecdfc 100644
--- a/src/bin/run_test.c
+++ b/src/bin/run_test.c
@@ -92,7 +92,7 @@ _file_sha1_get(const char *filename, unsigned char *result)
 fprintf(stderr, "Could not create Binary Buffer");
 goto false;
  }
-   if (!emile_binbuf_sha1(key, key_len, buf, result))
+   if (!emile_binbuf_hmac_sha1(key, key_len, buf, result))
  {
 fprintf(stderr, "Cannot generate sha1 for image");
 goto false;

-- 

Re: [E-devel] Announcing Efler - the EFL Installer

[Andrew Williams]

Hi Simon,

Thanks and yes I agree. This app started with the assumption that no-one
would package it!
The bootstrap script detects the OS(/distro) and attempts to setup a
complete baseline env required for efl.

Currently it only supports arch Linux but I'm working on it. Ubuntu and OS
X are high on my list too. The system scripts are pretty trivial really.

Unfortunately integrating with system package managers seems unlikely as
very few are as good as you for packaging efl stuff!

Thanks for the feedback,
Andrew
On Sun, 11 Sep 2016 at 02:14, Simon Lees  wrote:

>
>
> On 09/10/2016 08:12 AM, Andrew Williams wrote:
> > Not the most inspiring title but I wanted to share my latest project - an
> > app that will help us to promote, discover, install and keep up to date
> all
> > the EFL apps that are emerging - and the EFL itself too...
> >
> > The main reason behind this was to help more folk get into EFL easily -
> and
> > if we can avoid packaging and distribution problems at the same time then
> > even better.
> > I know that Marrakech is aiming to solve some of these problems and I
> think
> > that it will. Efler is designed to pick up mrk when it's ready but in the
> > meantime it's a build-from-source approach.
> > The UI portion is not yet working but the scripts are there - they do
> more
> > heavy lifting than they will need to in the future but hey - I'll migrate
> > it once the UI is up. And it can install EFL and cool apps in a single
> > command pasted from the web! :)
> >
> > Rather than going into more details here I have written it up in phab -
> > https://phab.enlightenment.org/w/projects/efler/
> >
> > Please let me know what you think of the idea / direction / apprach.
> Maybe
> > if it goes well we can have distros package this and the EFL lib and then
> > everything else can be done without bothering them?...
> > Andrew
>
> Hi Andrew,
>
> From a distro perspective many distro's have a policy of not allowing
> packages that download and install other software outside the package
> manager, some of these distro's include openSUSE, Debian and Fedora. The
> Gnome and KDE software centers get around this for the most part by
> intergrating with distro repositories.
>
> So if you want something like this to be effective it needs to be easy
> for a end user to install without a package manager. To do that you will
> probably need to test build on most of the major distro's and setup your
> script to automatically detect and install the required deps using the
> distro's package manager. An alternative would be shipping a
> rpm/deb/whatever that has the correct dependencies listed and executes
> the script in the post install stage.
>
> From an openSUSE perspective I probably wouldn't package it, but mostly
> based off the fact that every stable efl app that I know of is already
> in the distro (I don't count apps depending on eo stable as they will
> break if I change efl version) many of the "unstable" apps are also
> available in additional repos but I know openSUSE is the exception here.
>
>
> --
>
> Simon Lees (Simotek)http://simotek.net
>
> Emergency Update Team   keybase.io/simotek
> SUSE LinuxAdeliade Australia, UTC+9:30
> GPG Fingerprint: 5B87 DB9D 88DC F606 E489 CEC5 0922 C246 02F0 014B
>
>
> --
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel