[EGIT] [core/enlightenment] master 01/01: e - conf_display - fix meson build break which dropped a src file
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=71e1744147064435d368e98958d342b1a5de1272 commit 71e1744147064435d368e98958d342b1a5de1272 Author: Carsten Haitzler (Rasterman)Date: Wed Aug 9 09:17:36 2017 +0900 e - conf_display - fix meson build break which dropped a src file --- src/modules/conf_display/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/conf_display/meson.build b/src/modules/conf_display/meson.build index 55d9db2f6..358aaef1c 100644 --- a/src/modules/conf_display/meson.build +++ b/src/modules/conf_display/meson.build @@ -1,4 +1,5 @@ src = files( + 'e_mod_main.c', 'e_int_config_desk.c', 'e_int_config_desklock.c', 'e_int_config_desklock_fsel.c', --
[EGIT] [core/enlightenment] master 02/02: meson build - fix use module defines to be upper case again
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=dc9879c6ef61ed2575ccb6947524de8a925e4728 commit dc9879c6ef61ed2575ccb6947524de8a925e4728 Author: Carsten Haitzler (Rasterman)Date: Wed Aug 9 09:24:55 2017 +0900 meson build - fix use module defines to be upper case again --- src/modules/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/meson.build b/src/modules/meson.build index 9b7a80b80..ea27bd87d 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -81,7 +81,7 @@ foreach m: mods if get_option(opt) == true and disable == false -_conf = 'USE_MODULE_' + m.underscorify() +_conf = 'USE_MODULE_' + m.underscorify().to_upper() _dir = join_paths(dir_module_e, m) _dir_bin = join_paths(_dir, module_arch) _inc = include_directories(module_includes2, join_paths('.', m)) --
[EGIT] [core/enlightenment] master 01/02: meson build - geolocation - indent the same as other files
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=24cf739b2c1d20f2f2ef5cef690750d794bf90f9 commit 24cf739b2c1d20f2f2ef5cef690750d794bf90f9 Author: Carsten Haitzler (Rasterman)Date: Wed Aug 9 09:22:26 2017 +0900 meson build - geolocation - indent the same as other files --- src/modules/geolocation/meson.build | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/geolocation/meson.build b/src/modules/geolocation/meson.build index 7764eec83..817d0e0d1 100644 --- a/src/modules/geolocation/meson.build +++ b/src/modules/geolocation/meson.build @@ -9,11 +9,11 @@ created_file = [ ] src = [files( - 'e_mod_main.c' + 'e_mod_main.c' )] src += custom_target('geolocation_gen', - input: 'org.freedesktop.GeoClue2.xml', - command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'], - output: created_file -) + input : 'org.freedesktop.GeoClue2.xml', + command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'], + output : created_file +) --
[EGIT] [core/efl] master 01/01: examples: Fix grammar - 'forcely' is not a word
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=57fdaae824c0c3b1a942187181f636a1683c0bf3 commit 57fdaae824c0c3b1a942187181f636a1683c0bf3 Author: Bryce HarringtonDate: Tue Aug 8 15:28:20 2017 +0900 examples: Fix grammar - 'forcely' is not a word Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5077 --- src/examples/evas/evas-3d-cube.c | 2 +- src/examples/evas/evas-3d-cube2.c | 2 +- src/examples/evas/evas-3d-eet.c| 2 +- src/examples/evas/evas-3d-fog.c| 2 +- src/examples/evas/evas-3d-hull.c | 2 +- src/examples/evas/evas-3d-md2.c| 2 +- src/examples/evas/evas-3d-mmap-set.c | 2 +- src/examples/evas/evas-3d-obj.c| 2 +- src/examples/evas/evas-3d-parallax-occlusion.c | 2 +- src/examples/evas/evas-3d-pick.c | 2 +- src/examples/evas/evas-3d-ply.c| 2 +- src/examples/evas/evas-3d-proxy.c | 2 +- src/examples/evas/evas-3d-shadows.c| 2 +- src/examples/evas/evas-3d-static-lod.c | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c index 3d6bef1cc8..f82e9bf50e 100644 --- a/src/examples/evas/evas-3d-cube.c +++ b/src/examples/evas/evas-3d-cube.c @@ -218,7 +218,7 @@ _scene_setup(Scene_Data *data) int main(void) { - // Unless Evas 3D supports Software renderer, we set gl backend forcely. + // Unless Evas 3D supports Software renderer, we force use of the gl backend. setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); Scene_Data data; diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c index 8c7cbd36c5..0392c95710 100644 --- a/src/examples/evas/evas-3d-cube2.c +++ b/src/examples/evas/evas-3d-cube2.c @@ -213,7 +213,7 @@ _scene_setup(Scene_Data *data) int main(void) { - // Unless Evas 3D supports Software renderer, we set gl backend forcely. + // Unless Evas 3D supports Software renderer, we force use of the gl backend. setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); Scene_Data data; diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c index 2619bb1cdf..2d73c89a5e 100644 --- a/src/examples/evas/evas-3d-eet.c +++ b/src/examples/evas/evas-3d-eet.c @@ -98,7 +98,7 @@ _on_canvas_resize(Ecore_Evas *ee) int main(void) { - // Unless Evas 3D supports Software renderer, we set gl backend forcely. + // Unless Evas 3D supports Software renderer, we force use of the gl backend. setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-fog.c b/src/examples/evas/evas-3d-fog.c index 1ae330a4ea..94248d4dfc 100644 --- a/src/examples/evas/evas-3d-fog.c +++ b/src/examples/evas/evas-3d-fog.c @@ -190,7 +190,7 @@ _scene_setup(Scene_Data *data) int main(void) { - // Unless Evas 3D supports Software renderer, we set gl backend forcely. + // Unless Evas 3D supports Software renderer, we force use of the gl backend. setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); Scene_Data data; Ecore_Animator *anim; diff --git a/src/examples/evas/evas-3d-hull.c b/src/examples/evas/evas-3d-hull.c index 081316330c..d842a48b9d 100644 --- a/src/examples/evas/evas-3d-hull.c +++ b/src/examples/evas/evas-3d-hull.c @@ -412,7 +412,7 @@ main(void) Ecore_Animator *anim; Scene_Data data; - // Unless Evas 3D supports Software renderer, we set gl backend forcely. + // Unless Evas 3D supports Software renderer, we force use of the gl backend. setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c index d01f19be20..7a5c06cfb0 100644 --- a/src/examples/evas/evas-3d-md2.c +++ b/src/examples/evas/evas-3d-md2.c @@ -75,7 +75,7 @@ _on_canvas_resize(Ecore_Evas *ee) int main(void) { - // Unless Evas 3D supports Software renderer, we set gl backend forcely. + // Unless Evas 3D supports Software renderer, we force use of the gl backend. setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c index 50d0e9a261..5bce02b234 100644 --- a/src/examples/evas/evas-3d-mmap-set.c +++ b/src/examples/evas/evas-3d-mmap-set.c @@ -165,7 +165,7 @@ main(void) char buffer[PATH_MAX]; Eina_File *obj_file, *ply_file, *eet_file, *md2_file; - // Unless Evas 3D supports Software renderer, we set gl backend forcely. + // Unless Evas 3D supports Software renderer, we force use of the gl backend. setenv("ECORE_EVAS_ENGINE", "opengl_x11", 1); if (!ecore_evas_init()) return 0; diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c index
[EGIT] [website/www-content] master 01/01: Wiki page ubuntu-start changed with summary [] by Philippe Jean Guillaumie
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=2263f23d64c15ad2d22b496d64ea055544574498 commit 2263f23d64c15ad2d22b496d64ea055544574498 Author: Philippe Jean GuillaumieDate: Tue Aug 8 00:56:26 2017 -0700 Wiki page ubuntu-start changed with summary [] by Philippe Jean Guillaumie --- pages/distros/ubuntu-start.txt | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pages/distros/ubuntu-start.txt b/pages/distros/ubuntu-start.txt index 90f61b26..481186e6 100644 --- a/pages/distros/ubuntu-start.txt +++ b/pages/distros/ubuntu-start.txt @@ -11,15 +11,15 @@ libbluetooth-dev libbullet-dev libcogl-dev libfontconfig1-dev \ libfreetype6-dev libfribidi-dev libgif-dev libgstreamer1.0-dev \ libgstreamer-plugins-base1.0-dev libharfbuzz-dev libibus-1.0-dev \ libiconv-hook-dev libjpeg-dev libblkid-dev libluajit-5.1-dev \ -liblz4-dev libmount-dev libopenjpeg-dev libpam0g-dev \ -libpoppler-cpp-dev libpoppler-dev libpoppler-private-dev \ -libproxy-dev libpulse-dev libraw-dev librsvg2-dev libscim-dev \ -libsndfile1-dev libspectre-dev libssl-dev libsystemd-dev \ -libtiff5-dev libtool libudev-dev libudisks2-dev libunibreak-dev \ -libunwind-dev libvlc-dev libwebp-dev libxcb-keysyms1-dev \ -libxcursor-dev libxine2-dev libxinerama-dev libxkbfile-dev \ -libxrandr-dev libxss-dev libxtst-dev linux-tools-common \ -texlive-base unity-greeter-badges valgrind xserver-xephyr +liblz4-dev libmount-dev libpam0g-dev libpoppler-cpp-dev \ +libpoppler-dev libpoppler-private-dev libproxy-dev libpulse-dev \ +libraw-dev librsvg2-dev libscim-dev libsndfile1-dev libspectre-dev \ +libssl-dev libsystemd-dev libtiff5-dev libtool libudev-dev \ +libudisks2-dev libunibreak-dev libunwind-dev libvlc-dev libwebp-dev \ +libxcb-keysyms1-dev libxcursor-dev libxine2-dev libxinerama-dev \ +libxkbfile-dev libxrandr-dev libxss-dev libxtst-dev \ +linux-tools-common texlive-base unity-greeter-badges \ +valgrind xserver-xephyr --
[EGIT] [core/efl] master 01/01: test_gesture_layer: fix typo
eunue pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a9fdcc4cc2f5567fbc05ae418c4e3a4d13286f45 commit a9fdcc4cc2f5567fbc05ae418c4e3a4d13286f45 Author: Jaeun ChoiDate: Tue Aug 8 15:40:29 2017 +0900 test_gesture_layer: fix typo --- src/bin/elementary/test_gesture_layer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/elementary/test_gesture_layer.c b/src/bin/elementary/test_gesture_layer.c index 5f75e6f32e..0a7bdc29d1 100644 --- a/src/bin/elementary/test_gesture_layer.c +++ b/src/bin/elementary/test_gesture_layer.c @@ -256,7 +256,7 @@ momentum_end(void *_po, void *event_info) po->bx = 480 - (po->bw / 2); if (my < 0) - po->by = 0 - (po->bw / 2); + po->by = 0 - (po->bh / 2); else if (my > 800) po->by = 800 - (po->bh / 2); } --
[EGIT] [core/efl] master 01/01: test_gesture_layer3: fix typo
eunue pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=52368bf463c2b5ea7b69e15a7e34b1ea13258ca1 commit 52368bf463c2b5ea7b69e15a7e34b1ea13258ca1 Author: Jaeun ChoiDate: Tue Aug 8 16:44:23 2017 +0900 test_gesture_layer3: fix typo --- src/bin/elementary/test_gesture_layer3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/elementary/test_gesture_layer3.c b/src/bin/elementary/test_gesture_layer3.c index 9d89ca921c..9608d614a4 100644 --- a/src/bin/elementary/test_gesture_layer3.c +++ b/src/bin/elementary/test_gesture_layer3.c @@ -217,7 +217,7 @@ pic_obj_keep_inframe(void *_po) po->bx = 480 - (po->bw / 2); if (my < 0) - po->by = 0 - (po->bw / 2); + po->by = 0 - (po->bh / 2); else if (my > 800) po->by = 800 - (po->bh / 2); } --
[EGIT] [website/www-content] master 01/01: Wiki page fedora-start changed with summary [] by Philippe Jean Guillaumie
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b79da00e98fef6fd4b8525f2eb577ea7b61fd765 commit b79da00e98fef6fd4b8525f2eb577ea7b61fd765 Author: Philippe Jean GuillaumieDate: Tue Aug 8 01:34:03 2017 -0700 Wiki page fedora-start changed with summary [] by Philippe Jean Guillaumie --- pages/distros/fedora-start.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/distros/fedora-start.txt b/pages/distros/fedora-start.txt index 358ce110..30eb0cb2 100644 --- a/pages/distros/fedora-start.txt +++ b/pages/distros/fedora-start.txt @@ -13,7 +13,7 @@ libmount-devel libproxy-devel LibRaw-devel librsvg2-devel libsndfile-devel \ libspectre-devel libtiff-devel libtool libunwind-devel libwebp-devel libX11-devel \ libxkbcommon-devel libxkbfile-devel libXcursor-devel libXdamage-devel libXext-devel \ libXinerama-devel libXScrnSaver-devel libXtst-devel luajit-devel make \ -mesa-libgbm-devel mesa-libwayland-egl-devel openjpeg-devel openssl-devel pam-devel \ +mesa-libgbm-devel mesa-libwayland-egl-devel openssl-devel pam-devel \ perf poppler-cpp-devel pulseaudio-libs-devel scim-devel systemd-devel texlive-base \ uuid-devel valgrind-devel wayland-devel wayland-protocols-devel \ xcb-util-keysyms-devel xine-lib-devel xorg-x11-server-Xephyr --
[EGIT] [core/efl] master 01/01: elm_panel: use widget data for getting geometry
eunue pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=81f94ecadac8129da7dbbe5608e26c7207c7ee4a commit 81f94ecadac8129da7dbbe5608e26c7207c7ee4a Author: Jaeun ChoiDate: Tue May 23 13:11:59 2017 +0900 elm_panel: use widget data for getting geometry _elm_panel_efl_gfx_size_set() ends up calling _elm_panel_elm_layout_sizing_eval() to adjust the layout according to the updated width and height. however, evas_object_geometr_get() doesn't return the updated values. in fact, it is not necessary to call any API since the values are stored as widget data in _elm_widget_efl_gfx_size_set(). --- src/lib/elementary/elm_panel.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 892fb89501..0192e27439 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -64,11 +64,8 @@ _elm_panel_elm_layout_sizing_eval(Eo *obj, Elm_Panel_Data *sd) if (sd->scrollable) { -int w, h; -evas_object_geometry_get(obj, NULL, NULL, , ); - -if (sd->hidden) _drawer_close(obj, w, h, EINA_FALSE); -else _drawer_open(obj, w, h, EINA_FALSE); +if (sd->hidden) _drawer_close(obj, wd->w, wd->h, EINA_FALSE); +else _drawer_open(obj, wd->w, wd->h, EINA_FALSE); } evas_object_smart_calculate(sd->bx); --
[EGIT] [core/efl] master 01/01: elm: Add missing undef EAPI to Elementary.h
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ad6e3ce3df422751cb1c4524f1ea0b16ce897410 commit ad6e3ce3df422751cb1c4524f1ea0b16ce897410 Author: Jean-Philippe AndreDate: Wed Aug 9 13:24:48 2017 +0900 elm: Add missing undef EAPI to Elementary.h This may solve issues on Windows where EAPI can be either dllimport or dllexport. Anyway keeping EAPI defined is invalid and inconsistent. Also, change an invalid EO_BETA_API define tag to EFL_BETA_API_SUPPORT and EFL_EO_API_SUPPORT. Thanks @vtorri for the report! @fix --- src/lib/elementary/Elementary.h | 3 +++ src/lib/elementary/elm_helper.h | 2 +- src/lib/elementary/elm_priv.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h index 1ea4d67244..829a622bcf 100644 --- a/src/lib/elementary/Elementary.h +++ b/src/lib/elementary/Elementary.h @@ -285,4 +285,7 @@ EAPI extern Elm_Version *elm_version; } #endif +#undef EAPI +#define EAPI + #endif diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h index df117369a5..2cc350e869 100644 --- a/src/lib/elementary/elm_helper.h +++ b/src/lib/elementary/elm_helper.h @@ -77,7 +77,7 @@ elm_validator_regexp_free(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1); EAPI Elm_Regexp_Status elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNULL(1); -#ifdef EO_BETA_API +#if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT) /** * @brief The regex validator. Used as callback to validate event. * diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index 80f410ef43..5435e4557b 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -641,4 +641,7 @@ const Elm_Layout_Part_Alias_Description *elm_layout_text_aliases_get(const Eo *o #define ELM_LAYOUT_SIZING_EVAL_OPS(_pfx) \ EFL_OBJECT_OP_FUNC(elm_layout_sizing_eval, _##_pfx##_elm_layout_sizing_eval) +#undef EAPI +#define EAPI + #endif --
[EGIT] [core/efl] master 03/08: widget: Move signal functions to internal only
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1dad7e3e021871d2e7103877900aaafd2795eacf commit 1dad7e3e021871d2e7103877900aaafd2795eacf Author: Jean-Philippe AndreDate: Tue Aug 8 17:53:55 2017 +0900 widget: Move signal functions to internal only elm_widget APIs are internal only, even if they may be EAPI. The EAPI here is for modules. I believe this API is only required for layout objects, so simply should remain in the layout class. Then you can do efl_isa() and call the functions or accept error messages if you want to be more careless. Ref T5363 --- src/lib/elementary/elm_widget.c | 101 --- src/lib/elementary/elm_widget.eo | 25 -- 2 files changed, 52 insertions(+), 74 deletions(-) diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index d895b595cb..6554b4af83 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -3133,53 +3133,6 @@ _elm_widget_parent_highlight_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool h } EOLIAN static void -_elm_widget_signal_emit(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source) -{ - if (evas_object_smart_type_check(obj, "elm_layout")) - elm_layout_signal_emit(obj, emission, source); - else if (evas_object_smart_type_check(obj, "elm_icon")) - { -WRN("Deprecated function. This functionality on icon objects" -" will be dropped on a next release."); -_elm_icon_signal_emit(obj, emission, source); - } -} - -EOLIAN static void -_elm_widget_signal_callback_add(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func, void *data) -{ - EINA_SAFETY_ON_NULL_RETURN(func); - - if (evas_object_smart_type_check(obj, "elm_layout")) - elm_layout_signal_callback_add(obj, emission, source, func, data); - else if (evas_object_smart_type_check(obj, "elm_icon")) - { -WRN("Deprecated function. This functionality on icon objects" -" will be dropped on a next release."); - -_elm_icon_signal_callback_add(obj, emission, source, func, data); - } -} - -EOLIAN static void* -_elm_widget_signal_callback_del(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const char *emission, const char *source, Edje_Signal_Cb func) -{ - void *data = NULL; - - if (evas_object_smart_type_check(obj, "elm_layout")) - data = elm_layout_signal_callback_del(obj, emission, source, func); - else if (evas_object_smart_type_check(obj, "elm_icon")) - { -WRN("Deprecated function. This functionality on icon objects" -" will be dropped on a next release."); - -data = _elm_icon_signal_callback_del(obj, emission, source, func); - } - - return data; -} - -EOLIAN static void _elm_widget_focus_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool focus) { if (!sd->focused) @@ -4123,7 +4076,7 @@ _elm_widget_theme_object_set(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Object *ed { char buf[128]; snprintf(buf, sizeof(buf), "elm,state,orient,%d", sd->orient_mode); -elm_obj_widget_signal_emit(obj, buf, "elm"); +elm_widget_signal_emit(obj, buf, "elm"); } return ret; @@ -4702,7 +4655,7 @@ _elm_widget_orientation_set(Eo *obj, Elm_Widget_Smart_Data *sd, int orient_mode) { char buf[128]; snprintf(buf, sizeof(buf), "elm,state,orient,%d", orient_mode); -elm_obj_widget_signal_emit(obj, buf, "elm"); +elm_widget_signal_emit(obj, buf, "elm"); } } @@ -6587,6 +6540,56 @@ elm_widget_content_part_unset(Evas_Object *obj, return efl_content_unset(efl_part(obj, part)); } +EAPI void +elm_widget_signal_emit(Eo *obj, const char *emission, const char *source) +{ + ELM_WIDGET_CHECK(obj); + if (evas_object_smart_type_check(obj, "elm_layout")) + elm_layout_signal_emit(obj, emission, source); + else if (evas_object_smart_type_check(obj, "elm_icon")) + { +WRN("Deprecated function. This functionality on icon objects" +" will be dropped on a next release."); +_elm_icon_signal_emit(obj, emission, source); + } +} + +EAPI void +elm_widget_signal_callback_add(Eo *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data) +{ + ELM_WIDGET_CHECK(obj); + EINA_SAFETY_ON_NULL_RETURN(func); + if (evas_object_smart_type_check(obj, "elm_layout")) + elm_layout_signal_callback_add(obj, emission, source, func, data); + else if (evas_object_smart_type_check(obj, "elm_icon")) + { +WRN("Deprecated function. This functionality on icon objects" +" will be dropped on a next release."); + +_elm_icon_signal_callback_add(obj, emission, source, func, data); + } +} + +EAPI void * +elm_widget_signal_callback_del(Eo *obj,
[EGIT] [core/efl] master 07/08: widget: Clean up doc about disabled
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=23555ae461bffa72e3b919a6a3105ed1f3994894 commit 23555ae461bffa72e3b919a6a3105ed1f3994894 Author: Jean-Philippe AndreDate: Tue Aug 8 22:10:58 2017 +0900 widget: Clean up doc about disabled Ref T5363 --- src/lib/elementary/elm_widget.eo | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 380cd34950..17214939ed 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -54,6 +54,17 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, [[A canvas object (often a $Efl.Canvas.Layout object).]] } } + @property disabled { + [[Whether the widget is enabled (accepts and reacts to user inputs). + + Each widget may handle the disabled state differently, but overall + disabled widgets shall not respond to any input events. This is + $false by default, meaning the widget is enabled. + ]] + values { +disabled: bool(false); [[$true if the widget is disabled.]] + } + } @property focus { [[Focus property]] @@ -96,12 +107,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, th: ptr(Elm.Theme) @nullable; [[Elementary theme]] } } - @property disabled { -[[Enabled / disabled property]] - values { -disabled: bool; [[$true if the widget is disabled, $false otherwise]] - } - } @property highlight_ignore { [[Highlight ignore]] values { --
[EGIT] [core/efl] master 06/08: widget: Remove sub_obj arg to resize_object_set
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=24500384362f26b9bd8f5a1ee4db664cc98ec3b0 commit 24500384362f26b9bd8f5a1ee4db664cc98ec3b0 Author: Jean-Philippe AndreDate: Tue Aug 8 21:06:43 2017 +0900 widget: Remove sub_obj arg to resize_object_set This removes an argument that was false only for a single widget: naviframe. Hopefully this logic is now simpler, even though it involves a small hack within naviframe itself. Ref T5363 --- src/lib/elementary/efl_ui_box.c| 2 +- src/lib/elementary/efl_ui_grid.c | 2 +- src/lib/elementary/efl_ui_image_zoomable.c | 2 +- src/lib/elementary/efl_ui_layout.c | 2 +- src/lib/elementary/efl_ui_text.c | 6 +++--- src/lib/elementary/elc_naviframe.c | 9 - src/lib/elementary/elm_box.c | 4 +--- src/lib/elementary/elm_diskselector.c | 2 +- src/lib/elementary/elm_entry.c | 6 +++--- src/lib/elementary/elm_factory.c | 2 +- src/lib/elementary/elm_glview.c| 2 +- src/lib/elementary/elm_grid.c | 2 +- src/lib/elementary/elm_map.c | 2 +- src/lib/elementary/elm_mapbuf.c| 2 +- src/lib/elementary/elm_notify.c| 2 +- src/lib/elementary/elm_panel.c | 8 src/lib/elementary/elm_photo.c | 3 +-- src/lib/elementary/elm_plug.c | 2 +- src/lib/elementary/elm_prefs.c | 2 +- src/lib/elementary/elm_table.c | 2 +- src/lib/elementary/elm_toolbar.c | 2 +- src/lib/elementary/elm_widget.c| 27 +- src/lib/elementary/elm_widget.eo | 1 - src/lib/elementary/elm_widget.h| 4 ++-- src/modules/elementary/web/none/elm_web_none.c | 2 +- 25 files changed, 43 insertions(+), 57 deletions(-) diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index f699c61863..e18a706c52 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -176,7 +176,7 @@ _efl_ui_box_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED Evas *e = evas_object_evas_get(obj); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - elm_widget_resize_object_set(obj, evas_object_box_add(e), EINA_TRUE); + elm_widget_resize_object_set(obj, evas_object_box_add(e)); evas_object_box_layout_set(wd->resize_obj, _evas_box_custom_layout, obj, NULL); evas_object_event_callback_add(wd->resize_obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, obj); diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 67c47a86e5..131d9dd921 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -227,7 +227,7 @@ _efl_ui_grid_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Grid_Data *pd) custom->parent = obj; evas_object_table_homogeneous_set(table, EVAS_OBJECT_TABLE_HOMOGENEOUS_TABLE); - elm_widget_resize_object_set(obj, table, EINA_TRUE); + elm_widget_resize_object_set(obj, table); evas_object_event_callback_add (table, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _table_size_hints_changed, obj); diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 6f021da1a4..707d71e7ad 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -1426,7 +1426,7 @@ _efl_ui_image_zoomable_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Image_Zoomable elm_widget_sub_object_parent_add(obj); edje = edje_object_add(evas_object_evas_get(obj)); - elm_widget_resize_object_set(obj, edje, EINA_TRUE); + elm_widget_resize_object_set(obj, edje); efl_canvas_group_add(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 46d12bb265..934c86d5d4 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -726,7 +726,7 @@ _efl_ui_layout_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_ /* has to be there *before* parent's smart_add() */ edje = edje_object_add(evas_object_evas_get(obj)); - elm_widget_resize_object_set(obj, edje, EINA_TRUE); + elm_widget_resize_object_set(obj, edje); efl_canvas_group_add(efl_super(obj, MY_CLASS)); diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index ff066ed254..6d04306f01 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -3699,7 +3699,7 @@ _efl_ui_text_scrollable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool scroll) /* we now must re-theme ourselves to a scroller decoration * and move the entry looking object to be the content of the
[EGIT] [core/efl] master 01/08: examples: Fix sp. exemple_data
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=09d8ff787b49ccc34ebd4dcd940301aaeacbf95a commit 09d8ff787b49ccc34ebd4dcd940301aaeacbf95a Author: Bryce HarringtonDate: Tue Aug 8 15:53:59 2017 +0900 examples: Fix sp. exemple_data Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5075 --- src/examples/evas/evas-box.c | 4 ++-- src/examples/evas/evas-map-aa-eo.c | 4 ++-- src/examples/evas/evas-map-aa.c | 4 ++-- src/examples/evas/evas-transparent.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/examples/evas/evas-box.c b/src/examples/evas/evas-box.c index 22d445f400..314fe5f510 100644 --- a/src/examples/evas/evas-box.c +++ b/src/examples/evas/evas-box.c @@ -45,14 +45,14 @@ static const char *commands = \ "\tShift + NUMBER - remove the child object at that position in the box\n" "\th - print help\n"; -struct exemple_data +struct example_data { Ecore_Evas *ee; Evas*evas; Evas_Object *bg, *box, *border; }; -static struct exemple_data d; +static struct example_data d; static void /* custom 'diagonal' layout */ _custom_layout(Evas_Object *o, diff --git a/src/examples/evas/evas-map-aa-eo.c b/src/examples/evas/evas-map-aa-eo.c index 3b6b78ba37..818ebc6a18 100644 --- a/src/examples/evas/evas-map-aa-eo.c +++ b/src/examples/evas/evas-map-aa-eo.c @@ -33,7 +33,7 @@ #define IMAGE_SIZE_W 256 #define IMAGE_SIZE_H 256 -struct exemple_data +struct example_data { Ecore_Evas *ee; Evas*evas; @@ -53,7 +53,7 @@ struct exemple_data static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/cube1.png"; -static struct exemple_data d = +static struct example_data d = { NULL, NULL, NULL, NULL, NULL, 62, 62, 262, 62, 262, 262, 62, 262, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE }; diff --git a/src/examples/evas/evas-map-aa.c b/src/examples/evas/evas-map-aa.c index a3619f051a..634932fff5 100644 --- a/src/examples/evas/evas-map-aa.c +++ b/src/examples/evas/evas-map-aa.c @@ -25,7 +25,7 @@ #define IMAGE_SIZE_W 256 #define IMAGE_SIZE_H 256 -struct exemple_data +struct example_data { Ecore_Evas *ee; Evas*evas; @@ -45,7 +45,7 @@ struct exemple_data static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/cube1.png"; -static struct exemple_data d = +static struct example_data d = { NULL, NULL, NULL, NULL, NULL, 62, 62, 262, 62, 262, 262, 62, 262, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE }; diff --git a/src/examples/evas/evas-transparent.c b/src/examples/evas/evas-transparent.c index 1d4d67d210..9ec3eca6bb 100644 --- a/src/examples/evas/evas-transparent.c +++ b/src/examples/evas/evas-transparent.c @@ -46,14 +46,14 @@ static const char *commands = \ "\tm - turn off alpha" "\th - print help\n"; -struct exemple_data +struct example_data { Ecore_Evas *ee; Evas*evas; Evas_Object *bg; }; -static struct exemple_data d; +static struct example_data d; /* Keyboard event callback routine, to enable toggling transparency on * and off. --
[EGIT] [core/efl] master 02/08: examples: Correct the comments for key handling
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=be5b16850bfd9561f0052d678edab8c9e1f27641 commit be5b16850bfd9561f0052d678edab8c9e1f27641 Author: Bryce HarringtonDate: Tue Aug 8 15:54:06 2017 +0900 examples: Correct the comments for key handling Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5076 --- src/examples/evas/evas-vg-simple.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/examples/evas/evas-vg-simple.c b/src/examples/evas/evas-vg-simple.c index 30eed1edac..8783f24524 100644 --- a/src/examples/evas/evas-vg-simple.c +++ b/src/examples/evas/evas-vg-simple.c @@ -378,13 +378,13 @@ _interpolation_key_handle(void *data EINA_UNUSED, puts(basic_shape_menu); return; } - if (strcmp(ev->key, "e") == 0) /* print help */ + if (strcmp(ev->key, "e") == 0) /* exit */ { _on_delete(d.ee); return; } - if (strcmp(ev->key, "b") == 0) /* print help */ + if (strcmp(ev->key, "b") == 0) /* back to main menu */ { _main_menu(); return; --
[EGIT] [core/efl] master 01/01: ecore_fb_li: add error handling code related with calloc
jypark pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1ee59694ecc8212a565b6b5bc19288286465b91e commit 1ee59694ecc8212a565b6b5bc19288286465b91e Author: Jiyoun ParkDate: Wed Aug 9 11:10:20 2017 +0900 ecore_fb_li: add error handling code related with calloc --- src/lib/ecore_fb/ecore_fb_li.c | 9 + 1 file changed, 9 insertions(+) diff --git a/src/lib/ecore_fb/ecore_fb_li.c b/src/lib/ecore_fb/ecore_fb_li.c index 8198fd446e..453817bf97 100644 --- a/src/lib/ecore_fb/ecore_fb_li.c +++ b/src/lib/ecore_fb/ecore_fb_li.c @@ -112,6 +112,9 @@ _ecore_fb_li_device_event_key(Ecore_Fb_Input_Device *dev, struct input_event *ie e = calloc(1, sizeof(Ecore_Event_Key) + strlen(key) + strlen(keyname) + (compose ? strlen(compose) : 0) + 3); +if (!e) + return; + e->keyname = (char *)(e + 1); e->key = e->keyname + strlen(keyname) + 1; e->compose = (compose) ? e->key + strlen(key) + 1 : NULL; @@ -362,6 +365,8 @@ _ecore_fb_li_device_event_syn(Ecore_Fb_Input_Device *dev, struct input_event *ie { Ecore_Event_Mouse_Move *ev; ev = calloc(1,sizeof(Ecore_Event_Mouse_Move)); +if (!ev) + return; ev->x = dev->mouse.x; ev->y = dev->mouse.y; ev->root.x = ev->x; @@ -373,6 +378,8 @@ _ecore_fb_li_device_event_syn(Ecore_Fb_Input_Device *dev, struct input_event *ie { Ecore_Event_Mouse_Button *ev; ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)); +if (!ev) + return; ev->x = dev->mouse.x; ev->y = dev->mouse.y; ev->root.x = ev->x; @@ -385,6 +392,8 @@ _ecore_fb_li_device_event_syn(Ecore_Fb_Input_Device *dev, struct input_event *ie { Ecore_Event_Mouse_Button *ev; ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)); +if (!ev) + return; ev->x = dev->mouse.x; ev->y = dev->mouse.y; ev->root.x = ev->x; --
[EGIT] [core/efl] master 05/08: naviframe: Override resize_object_set
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=76088133dca88d89718791fc3caccc7ef694fa40 commit 76088133dca88d89718791fc3caccc7ef694fa40 Author: Jean-Philippe AndreDate: Tue Aug 8 20:37:41 2017 +0900 naviframe: Override resize_object_set This is a first step into allowing me to removing the sub_obj argument. Make elm_widget resize_object a protected property. See also D265 Ref T5363 --- src/lib/elementary/elc_naviframe.c | 20 src/lib/elementary/elm_naviframe.eo | 1 + src/lib/elementary/elm_widget.eo| 26 +- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 3cc642ad31..7e518cf959 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -5,6 +5,7 @@ #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED +#define ELM_WIDGET_PROTECTED #include #include "elm_priv.h" @@ -57,6 +58,25 @@ static const Elm_Action key_actions[] = { {NULL, NULL} }; +EOLIAN static void +_elm_naviframe_elm_widget_resize_object_set(Eo *obj, Elm_Naviframe_Data *pd EINA_UNUSED, +Efl_Canvas_Object *sobj, Eina_Bool sub_obj) +{ + if (!sobj || !efl_finalized_get(obj)) goto super; + EINA_SAFETY_ON_TRUE_RETURN(sub_obj); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); + + if (wd->resize_obj == sobj) return; + + // Detach the previous page as resize object to avoid any modifications to + // it by the widget implementation. This preserves clip, smart membership, + // focus, etc... + wd->resize_obj = NULL; + +super: + elm_obj_widget_resize_object_set(efl_super(obj, MY_CLASS), sobj, EINA_TRUE); +} + static void _resize_object_reset(Evas_Object *obj, Elm_Naviframe_Item_Data *it) { diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index 811be7d39d..18974b2749 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -154,6 +154,7 @@ class Elm.Naviframe (Efl.Ui.Layout, Elm.Interface.Atspi_Widget_Action) Elm.Widget.widget_event; Efl.Canvas.Layout_Signal.signal_emit; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Elm.Widget.resize_object { set; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index cb7e25b8f8..45aa9c0b37 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -39,6 +39,23 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, event_prefix: elm_widget; data: Elm_Widget_Smart_Data; methods { + @property resize_object @protected { + [[This is the internal canvas object managed by a widget. + + This property is protected as it is meant for widget implementations + only, to set and access the internal canvas object. Do use this + function unless you're implementing a widget. + ]] + set { +[[Sets the new resize object for this widget.]] + } + values { +sobj: Efl.Canvas.Object @nullable; + [[A canvas object (often a $Efl.Canvas.Layout object).]] +sub_obj: bool; [[$true if sub object exists, $false otherwise]] + } + } + @property focus { [[Focus property]] values { @@ -241,15 +258,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, rotation: int; [[Orientation]] } } - @property resize_object { -[[Resize object property]] - set { - } - values { -sobj: Efl.Canvas.Object @nullable; [[Object]] -sub_obj: bool; [[$true if sub object exists, $false otherwise]] - } - } @property domain_translatable_part_text { [[Domain translatable text part property]] set { --
[EGIT] [core/efl] master 08/08: widget: Remove scrollable_children from EO
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=10ec5f5f80bf2e824ac91a46a66cc5dc07a84a64 commit 10ec5f5f80bf2e824ac91a46a66cc5dc07a84a64 Author: Jean-Philippe AndreDate: Tue Aug 8 22:53:58 2017 +0900 widget: Remove scrollable_children from EO It's an internal only function, which IMHO was not required and an overhead over the simple loop. Ref T5363 --- src/lib/elementary/elm_widget.c | 58 src/lib/elementary/elm_widget.eo | 11 +++- src/lib/elementary/elm_widget.h | 6 - 3 files changed, 20 insertions(+), 55 deletions(-) diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index 8c5802663f..505d545199 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -3510,25 +3510,6 @@ _elm_widget_parents_bounce_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, while (parent_obj); } -EOLIAN static Eina_List* -_elm_widget_scrollable_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd) -{ - Eina_List *ret; - ret = NULL; - - Eina_List *l; - Evas_Object *child; - - - EINA_LIST_FOREACH(sd->subobjs, l, child) - { -if (elm_widget_is(child) && _elm_scrollable_is(child)) - ret = eina_list_append(ret, child); - } - - return ret; -} - EOLIAN static void _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd) { @@ -3539,15 +3520,14 @@ _elm_widget_scroll_hold_push(Eo *obj, Elm_Widget_Smart_Data *sd) elm_interface_scrollable_hold_set(obj, EINA_TRUE); else { - Eina_List *scr_children, *l; Evas_Object *child; + Eina_List *l; - scr_children = elm_widget_scrollable_children_get(obj); - EINA_LIST_FOREACH(scr_children, l, child) + EINA_LIST_FOREACH(sd->subobjs, l, child) { - elm_interface_scrollable_hold_set(child, EINA_TRUE); + if (elm_widget_is(child) && _elm_scrollable_is(child)) +elm_interface_scrollable_hold_set(child, EINA_TRUE); } - eina_list_free(scr_children); } } if (sd->parent_obj) elm_obj_widget_scroll_hold_push(sd->parent_obj); @@ -3564,15 +3544,14 @@ _elm_widget_scroll_hold_pop(Eo *obj, Elm_Widget_Smart_Data *sd) elm_interface_scrollable_hold_set(obj, EINA_FALSE); else { - Eina_List *scr_children, *l; Evas_Object *child; + Eina_List *l; - scr_children = elm_widget_scrollable_children_get(obj); - EINA_LIST_FOREACH(scr_children, l, child) + EINA_LIST_FOREACH(sd->subobjs, l, child) { - elm_interface_scrollable_hold_set(child, EINA_FALSE); + if (elm_widget_is(child) && _elm_scrollable_is(child)) +elm_interface_scrollable_hold_set(child, EINA_FALSE); } - eina_list_free(scr_children); } } if (sd->parent_obj) elm_obj_widget_scroll_hold_pop(sd->parent_obj); @@ -3595,15 +3574,14 @@ _elm_widget_scroll_freeze_push(Eo *obj, Elm_Widget_Smart_Data *sd) elm_interface_scrollable_freeze_set(obj, EINA_TRUE); else { - Eina_List *scr_children, *l; Evas_Object *child; + Eina_List *l; - scr_children = elm_widget_scrollable_children_get(obj); - EINA_LIST_FOREACH(scr_children, l, child) + EINA_LIST_FOREACH(sd->subobjs, l, child) { - elm_interface_scrollable_freeze_set(child, EINA_TRUE); + if (elm_widget_is(child) && _elm_scrollable_is(child)) +elm_interface_scrollable_freeze_set(child, EINA_TRUE); } - eina_list_free(scr_children); } } if (sd->parent_obj) elm_obj_widget_scroll_freeze_push(sd->parent_obj); @@ -3620,15 +3598,14 @@ _elm_widget_scroll_freeze_pop(Eo *obj, Elm_Widget_Smart_Data *sd) elm_interface_scrollable_freeze_set(obj, EINA_FALSE); else { - Eina_List *scr_children, *l; Evas_Object *child; + Eina_List *l; - scr_children = elm_widget_scrollable_children_get(obj); - EINA_LIST_FOREACH(scr_children, l, child) + EINA_LIST_FOREACH(sd->subobjs, l, child) { - elm_interface_scrollable_freeze_set(child, EINA_FALSE); + if (elm_widget_is(child) && _elm_scrollable_is(child)) +elm_interface_scrollable_freeze_set(child, EINA_FALSE); } - eina_list_free(scr_children); } } if (sd->parent_obj) elm_obj_widget_scroll_freeze_pop(sd->parent_obj); @@ -4045,13 +4022,12 @@
[EGIT] [core/efl] master 04/08: eo: Add a space in documentation
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8b3c1eb069169778c069dcab4c0f1a2d946ab899 commit 8b3c1eb069169778c069dcab4c0f1a2d946ab899 Author: Jean-Philippe AndreDate: Tue Aug 8 18:14:07 2017 +0900 eo: Add a space in documentation This separates the brief and the content. --- src/lib/eo/efl_object.eo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo index f31606f293..36174c8d2f 100644 --- a/src/lib/eo/efl_object.eo +++ b/src/lib/eo/efl_object.eo @@ -166,7 +166,8 @@ abstract Efl.Object () } name_find { [[Find a child object with the given name and return it. - The search string can be a glob (shell style). It can also + + The search string can be a glob (shell style, using *). It can also specify class name in the format of "class:name" where ":" separates class and name. Both class and name can be globs. If class is specified, and name is empty like "class:" then --
[EGIT] [core/enlightenment] master 02/06: meson: use file instead of doing the relative path by hand
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=29901d67b23e5d1c3509d84324de7ca17a96b31c commit 29901d67b23e5d1c3509d84324de7ca17a96b31c Author: Marcel HollerbachDate: Tue Aug 8 18:19:11 2017 +0200 meson: use file instead of doing the relative path by hand a reason for doing that is that you can just pack together targets into a array and pass them to our helper, and the helper will just handle them, so even module with eldbus codegen etc is now supported. This also means that we are just passing the src object directly into the shared_module call, which means the user of our helper can just pack everything he needs into the src var and the helper does not need to know about it. --- src/modules/appmenu/meson.build | 4 ++-- src/modules/backlight/meson.build| 4 ++-- src/modules/bluez4/meson.build | 4 ++-- src/modules/clock/meson.build| 4 ++-- src/modules/conf/meson.build | 4 ++-- src/modules/conf_applications/meson.build| 4 ++-- src/modules/conf_bindings/meson.build| 4 ++-- src/modules/conf_dialogs/meson.build | 4 ++-- src/modules/conf_display/meson.build | 5 ++--- src/modules/conf_interaction/meson.build | 4 ++-- src/modules/conf_intl/meson.build| 4 ++-- src/modules/conf_menus/meson.build | 4 ++-- src/modules/conf_paths/meson.build | 4 ++-- src/modules/conf_performance/meson.build | 4 ++-- src/modules/conf_randr/meson.build | 4 ++-- src/modules/conf_shelves/meson.build | 4 ++-- src/modules/conf_theme/meson.build | 4 ++-- src/modules/conf_window_manipulation/meson.build | 4 ++-- src/modules/conf_window_remembers/meson.build| 4 ++-- src/modules/connman/meson.build | 4 ++-- src/modules/fileman/meson.build | 4 ++-- src/modules/fileman_opinfo/meson.build | 4 ++-- src/modules/gadman/meson.build | 4 ++-- src/modules/ibar/meson.build | 4 ++-- src/modules/ibox/meson.build | 4 ++-- src/modules/lokker/meson.build | 4 ++-- src/modules/luncher/meson.build | 4 ++-- src/modules/meson.build | 9 ++--- src/modules/msgbus/meson.build | 4 ++-- src/modules/notification/meson.build | 4 ++-- src/modules/packagekit/meson.build | 4 ++-- src/modules/pager/meson.build| 4 ++-- src/modules/pager_plain/meson.build | 4 ++-- src/modules/quickaccess/meson.build | 4 ++-- src/modules/shot/meson.build | 4 ++-- src/modules/start/meson.build| 4 ++-- src/modules/syscon/meson.build | 4 ++-- src/modules/systray/meson.build | 4 ++-- src/modules/tasks/meson.build| 4 ++-- src/modules/teamwork/meson.build | 4 ++-- src/modules/temperature/meson.build | 4 ++-- src/modules/tiling/meson.build | 4 ++-- src/modules/time/meson.build | 4 ++-- src/modules/winlist/meson.build | 4 ++-- src/modules/wireless/meson.build | 4 ++-- src/modules/wizard/meson.build | 4 ++-- src/modules/wl_buffer/meson.build| 4 ++-- src/modules/wl_drm/meson.build | 4 ++-- src/modules/wl_wl/meson.build| 4 ++-- src/modules/wl_x11/meson.build | 4 ++-- src/modules/xkbswitch/meson.build| 4 ++-- src/modules/xwayland/meson.build | 4 ++-- 52 files changed, 104 insertions(+), 110 deletions(-) diff --git a/src/modules/appmenu/meson.build b/src/modules/appmenu/meson.build index 3a3813d9b..335a6de45 100644 --- a/src/modules/appmenu/meson.build +++ b/src/modules/appmenu/meson.build @@ -1,6 +1,6 @@ -src = [ +src = files( 'e_mod_main.c', 'e_mod_appmenu_render.c', 'e_mod_dbus_registrar_server.c', 'e_mod_appmenu_private.h' -] + ) diff --git a/src/modules/backlight/meson.build b/src/modules/backlight/meson.build index 9e19e8c7b..c601cd6fc 100644 --- a/src/modules/backlight/meson.build +++ b/src/modules/backlight/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'gadget/backlight.c', 'gadget/mod.c' -] +) diff --git a/src/modules/bluez4/meson.build b/src/modules/bluez4/meson.build index 0e0e627f5..05262db4e 100644 --- a/src/modules/bluez4/meson.build +++ b/src/modules/bluez4/meson.build @@ -1,5 +1,5 @@ -src = [ +src = files( 'e_mod_main.c', 'agent.c', 'ebluez4.c' -] +) diff --git a/src/modules/clock/meson.build b/src/modules/clock/meson.build index 9d426f36f..b42668d41 100644
[EGIT] [core/enlightenment] master 06/06: pager: do not define Config twice
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5b03bfabc37ad5adc3154ce1ce52effc698984eb commit 5b03bfabc37ad5adc3154ce1ce52effc698984eb Author: Marcel HollerbachDate: Tue Aug 8 18:46:45 2017 +0200 pager: do not define Config twice --- src/modules/pager/e_mod_main.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/pager/e_mod_main.h b/src/modules/pager/e_mod_main.h index 90409952e..fc6a5221c 100644 --- a/src/modules/pager/e_mod_main.h +++ b/src/modules/pager/e_mod_main.h @@ -2,7 +2,6 @@ #define E_MOD_MAIN_H #include "gadget/pager.h" -typedef struct _Config Config; typedef struct _Config_Item Config_Item; #define PAGER_RESIZE_NONE 0 --
[EGIT] [core/enlightenment] master 01/06: meson: we should probebly configure the xsession file correctly
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=3becd06c94ba7cc2dd48c2761134b818f3b5a60d commit 3becd06c94ba7cc2dd48c2761134b818f3b5a60d Author: Marcel HollerbachDate: Tue Aug 8 17:34:13 2017 +0200 meson: we should probebly configure the xsession file correctly otherwise we end up with wrong enlightenment_start Exec paths --- data/xsession/meson.build | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/xsession/meson.build b/data/xsession/meson.build index ea895ab17..2a07a0ee3 100644 --- a/data/xsession/meson.build +++ b/data/xsession/meson.build @@ -1,6 +1,9 @@ +desktop_config = configuration_data() +desktop_config.set('prefix', dir_prefix) + configure_file(input: 'enlightenment.desktop.in', output: 'enlightenment.desktop', install: true, install_dir: join_paths(dir_data, 'xsessions'), - configuration: config_h + configuration: desktop_config ) --
[EGIT] [core/enlightenment] master 04/06: meson: port geolocation
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c0e6628651ecc97314af128e763f4e49d0d106bb commit c0e6628651ecc97314af128e763f4e49d0d106bb Author: Marcel HollerbachDate: Tue Aug 8 18:33:11 2017 +0200 meson: port geolocation --- src/modules/geolocation/meson.build | 53 +++-- src/modules/meson.build | 2 +- 2 files changed, 16 insertions(+), 39 deletions(-) diff --git a/src/modules/geolocation/meson.build b/src/modules/geolocation/meson.build index 21c413200..7764eec83 100644 --- a/src/modules/geolocation/meson.build +++ b/src/modules/geolocation/meson.build @@ -1,42 +1,19 @@ -geolocation_dist = [ - 'e-module-geolocation.edj', - 'module.desktop', +created_file = [ + 'eldbus_geo_clue2_client.c', + 'eldbus_geo_clue2_client.h', + 'eldbus_geo_clue2_location.c', + 'eldbus_geo_clue2_location.h', + 'eldbus_geo_clue2_manager.c', + 'eldbus_geo_clue2_manager.h', + 'eldbus_utils.h' ] -geolocation_src = [ +src = [files( 'e_mod_main.c' -] - -geolocation_dir = join_paths(dir_module_e, 'geolocation', module_arch) -if get_option('geolocation') == true - config_h.set('USE_MODULE_GEOLOCATION', '1') - - install_data(geolocation_dist, - install_dir: join_paths(dir_module_e, 'geolocation') - ) - - gen_geo = custom_target('geolocation_gen', - input: 'org.freedesktop.GeoClue2.xml', - command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'], - output: [ - 'eldbus_geo_clue2_client.c', - 'eldbus_geo_clue2_client.h', - 'eldbus_geo_clue2_location.c', - 'eldbus_geo_clue2_location.h', - 'eldbus_geo_clue2_manager.c', - 'eldbus_geo_clue2_manager.h', - 'eldbus_utils.h' - ] - ) - -module_files += join_paths(geolocation_dir, 'geolocation.so') - shared_module('geolocation', -[geolocation_src, gen_geo], -include_directories: include_directories(module_includes), -name_prefix: '', -dependencies: module_deps, -install_dir: geolocation_dir, -install: true -) -endif +)] +src += custom_target('geolocation_gen', + input: 'org.freedesktop.GeoClue2.xml', + command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'], + output: created_file +) diff --git a/src/modules/meson.build b/src/modules/meson.build index 2d0f511d4..f22869c68 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -7,7 +7,6 @@ subdir('teamwork') subdir('wl_desktop_shell') subdir('wl_text_input') subdir('wl_weekeyboard') -subdir('geolocation') subdir('sysinfo') # disabled for now @@ -39,6 +38,7 @@ mods = [ 'conf_paths', 'conf_interaction', 'gadman', + 'geolocation', 'connman', 'bluez4', 'syscon', --
[EGIT] [core/efl] master 01/02: ecore-wl2: Add support for Window Iconify State Change
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=42b082fe36d96435ba77e8f46fa99657 commit 42b082fe36d96435ba77e8f46fa99657 Author: Chris MichaelDate: Tue Aug 8 09:53:52 2017 -0400 ecore-wl2: Add support for Window Iconify State Change This patch adds support for the Window Iconify State Change event structure and the ecore event type to support it. '#divergence' @feature Signed-off-by: Chris Michael --- src/lib/ecore_wl2/Ecore_Wl2.h | 8 src/lib/ecore_wl2/ecore_wl2.c | 5 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h index eab1bfe3e7..06e5c84ac7 100644 --- a/src/lib/ecore_wl2/Ecore_Wl2.h +++ b/src/lib/ecore_wl2/Ecore_Wl2.h @@ -315,6 +315,13 @@ typedef struct _Ecore_Wl2_Event_Window_Deactivate unsigned int event_win; } Ecore_Wl2_Event_Window_Deactivate; +typedef struct _Ecore_Wl2_Event_Window_Iconify_State_Change +{ + unsigned int win; + unsigned int iconified; + unsigned int force; +} Ecore_Wl2_Event_Window_Iconify_State_Change; + typedef enum _Ecore_Wl2_Window_Type { ECORE_WL2_WINDOW_TYPE_NONE, @@ -395,6 +402,7 @@ EAPI extern int ECORE_WL2_EVENT_WINDOW_SHOW; /** @since 1.20 */ EAPI extern int ECORE_WL2_EVENT_WINDOW_HIDE; /** @since 1.20 */ EAPI extern int ECORE_WL2_EVENT_WINDOW_ACTIVATE; /** @since 1.20 */ EAPI extern int ECORE_WL2_EVENT_WINDOW_DEACTIVATE; /** @since 1.20 */ +EAPI extern int ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE; /** @since 1.21 */ /** * @file diff --git a/src/lib/ecore_wl2/ecore_wl2.c b/src/lib/ecore_wl2/ecore_wl2.c index 645012f4e4..ba22eb1986 100644 --- a/src/lib/ecore_wl2/ecore_wl2.c +++ b/src/lib/ecore_wl2/ecore_wl2.c @@ -52,6 +52,7 @@ EAPI int ECORE_WL2_EVENT_WINDOW_SHOW = 0; EAPI int ECORE_WL2_EVENT_WINDOW_HIDE = 0; EAPI int ECORE_WL2_EVENT_WINDOW_ACTIVATE = 0; EAPI int ECORE_WL2_EVENT_WINDOW_DEACTIVATE = 0; +EAPI int ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE = 0; EAPI int _ecore_wl2_event_window_www = -1; EAPI int _ecore_wl2_event_window_www_drag = -1; @@ -134,6 +135,7 @@ ecore_wl2_init(void) ECORE_WL2_EVENT_WINDOW_HIDE = ecore_event_type_new(); ECORE_WL2_EVENT_WINDOW_ACTIVATE = ecore_event_type_new(); ECORE_WL2_EVENT_WINDOW_DEACTIVATE = ecore_event_type_new(); +ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE = ecore_event_type_new(); } if (!no_session_recovery) no_session_recovery = !!getenv("EFL_NO_WAYLAND_SESSION_RECOVERY"); @@ -203,7 +205,8 @@ ecore_wl2_shutdown(void) ECORE_WL2_EVENT_WINDOW_SHOW, ECORE_WL2_EVENT_WINDOW_HIDE, ECORE_WL2_EVENT_WINDOW_ACTIVATE, - ECORE_WL2_EVENT_WINDOW_DEACTIVATE); + ECORE_WL2_EVENT_WINDOW_DEACTIVATE, + ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE); /* shutdown Ecore_Event */ ecore_event_shutdown(); --
[EGIT] [core/efl] master 02/02: ecore-evas-wayland: Add handler for Iconify State Change event
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4cf448274c631b6aa756ff6f83f355c41922e01a commit 4cf448274c631b6aa756ff6f83f355c41922e01a Author: Chris MichaelDate: Tue Aug 8 10:00:11 2017 -0400 ecore-evas-wayland: Add handler for Iconify State Change event Small patch to add a handler for catching Window Iconify State Change events '#divergence' @feature Signed-off-by: Chris Michael --- .../engines/wayland/ecore_evas_wayland_common.c| 27 -- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index c7a3206e76..970c5f39b6 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -28,7 +28,7 @@ struct _EE_Wl_Device /* local variables */ static int _ecore_evas_wl_init_count = 0; -static Ecore_Event_Handler *_ecore_evas_wl_event_hdls[20]; +static Ecore_Event_Handler *_ecore_evas_wl_event_hdls[17]; static void _ecore_evas_wayland_resize(Ecore_Evas *ee, int location); static void _ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize); @@ -588,7 +588,7 @@ _ecore_evas_wl_common_cb_aux_hint_allowed(void *data EINA_UNUSED, int type EINA { _ecore_evas_wl_common_state_update(ee); aux->notified = 1; -} + } break; } } @@ -1080,6 +1080,26 @@ _ecore_evas_wl_common_cb_seat_capabilities_changed(void *d EINA_UNUSED, int t EI return ECORE_CALLBACK_PASS_ON; } +static Eina_Bool +_ecore_evas_wl_common_cb_iconify_state_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) +{ + Ecore_Evas *ee; + Ecore_Wl2_Event_Window_Iconify_State_Change *ev; + + ev = event; + ee = ecore_event_window_match(ev->win); + if (!ee) return ECORE_CALLBACK_PASS_ON; + if (!ev->force) return ECORE_CALLBACK_PASS_ON; + if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; + + if (ee->prop.iconified == ev->iconified) + return ECORE_CALLBACK_PASS_ON; + + ee->prop.iconified = ev->iconified; + _ecore_evas_wl_common_state_update(ee); + return ECORE_CALLBACK_PASS_ON; +} + static int _ecore_evas_wl_common_init(void) { @@ -1138,6 +1158,9 @@ _ecore_evas_wl_common_init(void) _ecore_evas_wl_event_hdls[15] = ecore_event_handler_add(ECORE_WL2_EVENT_AUX_HINT_SUPPORTED, _ecore_evas_wl_common_cb_aux_hint_supported, NULL); + _ecore_evas_wl_event_hdls[16] = + ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE, + _ecore_evas_wl_common_cb_iconify_state_change, NULL); ecore_event_evas_init(); --
[EGIT] [core/efl] master 01/01: ecore_audio_pulse_ml: Check memory allocation fail
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=db7ed3dcddc6b824db83c6d2d5de162206d14293 commit db7ed3dcddc6b824db83c6d2d5de162206d14293 Author: Jaehyun ChoDate: Tue Aug 8 22:05:43 2017 +0900 ecore_audio_pulse_ml: Check memory allocation fail --- src/lib/ecore_audio/ecore_audio_pulse_ml.c | 18 ++ 1 file changed, 18 insertions(+) diff --git a/src/lib/ecore_audio/ecore_audio_pulse_ml.c b/src/lib/ecore_audio/ecore_audio_pulse_ml.c index 19b652f649..cc1a874fda 100644 --- a/src/lib/ecore_audio/ecore_audio_pulse_ml.c +++ b/src/lib/ecore_audio/ecore_audio_pulse_ml.c @@ -89,6 +89,12 @@ _ecore_pa_io_new(pa_mainloop_api *api, int fd, pa_io_event_flags_t flags, pa_io_ pa_io_event *event; event = calloc(1, sizeof(pa_io_event)); + if (!event) + { +ERR("Failed to allocate memory!"); +return NULL; + } + event->mainloop = api; event->userdata = userdata; event->callback = cb; @@ -176,6 +182,12 @@ _ecore_pa_time_new(pa_mainloop_api *api, const struct timeval *tv, pa_time_event double interval; event = calloc(1, sizeof(pa_time_event)); + if (!event) + { +ERR("Failed to allocate memory!"); +return NULL; + } + event->mainloop = api; event->userdata = userdata; event->callback = cb; @@ -263,6 +275,12 @@ _ecore_pa_defer_new(pa_mainloop_api *api, pa_defer_event_cb_t cb, void *userdata pa_defer_event *event; event = calloc(1, sizeof(pa_defer_event)); + if (!event) + { +ERR("Failed to allocate memory!"); +return NULL; + } + event->mainloop = api; event->userdata = userdata; event->callback = cb; --
[EGIT] [core/enlightenment] master 05/06: meson: underscrorify the module name
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=288807254765b2e74bcefa8f062eb592865776ea commit 288807254765b2e74bcefa8f062eb592865776ea Author: Marcel HollerbachDate: Tue Aug 8 18:35:40 2017 +0200 meson: underscrorify the module name otherwise we could confuse the prepocessor of c --- src/modules/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/meson.build b/src/modules/meson.build index f22869c68..9b7a80b80 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -81,7 +81,7 @@ foreach m: mods if get_option(opt) == true and disable == false -_conf = 'USE_MODULE_' + m.to_upper() +_conf = 'USE_MODULE_' + m.underscorify() _dir = join_paths(dir_module_e, m) _dir_bin = join_paths(_dir, module_arch) _inc = include_directories(module_includes2, join_paths('.', m)) --
[EGIT] [core/enlightenment] master 03/06: meson: port music-control
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1caa1405034bf280248b501897b794c39aa72de5 commit 1caa1405034bf280248b501897b794c39aa72de5 Author: Marcel HollerbachDate: Tue Aug 8 18:21:04 2017 +0200 meson: port music-control --- src/modules/meson.build | 2 +- src/modules/music-control/meson.build | 52 ++- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/src/modules/meson.build b/src/modules/meson.build index 11d713a77..2d0f511d4 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -4,7 +4,6 @@ subdir('wizard') subdir('mixer') subdir('everything') subdir('teamwork') -subdir('music-control') subdir('wl_desktop_shell') subdir('wl_text_input') subdir('wl_weekeyboard') @@ -29,6 +28,7 @@ mods = [ 'fileman_opinfo', 'conf', 'msgbus', + 'music-control', 'conf_applications', 'conf_shelves', 'conf_window_remembers', diff --git a/src/modules/music-control/meson.build b/src/modules/music-control/meson.build index d1fc0843b..ffe933619 100644 --- a/src/modules/music-control/meson.build +++ b/src/modules/music-control/meson.build @@ -1,44 +1,22 @@ -module = 'music_control' -opt= 'music-control' -conf = 'USE_MODULE_MUSIC_CONTROL' +created_file = [ + 'eldbus_media_player2_player.c', + 'eldbus_mpris_media_player2.c', + 'eldbus_media_player2_player.h', + 'eldbus_mpris_media_player2.h', + 'eldbus_utils.h' +] -src = [ +src = [files( 'e_mod_main.c', 'ui.c', 'e_mod_main.h', 'private.h' -] - -icon = [ - 'e-module-' + module + '.edj', - 'module.desktop' -] - -dir_mod = join_paths(dir_module_e, module) -dir_mod_bin = join_paths(dir_mod, module_arch) - -if get_option(opt) == true - config_h.set(conf, '1') - module_files += join_paths(dir_mod_bin, module + '.so') +)] - install_data(icon, install_dir: dir_mod) +src += custom_target('gen-dbus', + input : 'introspect.xml', + command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'], + output : created_file +) - gen_dbus = custom_target('gen-dbus', - input : 'introspect.xml', - command: [eldbus_codegen, '@INPUT@', '-O', '@OUTDIR@'], - output : [ - 'eldbus_media_player2_player.c', - 'eldbus_mpris_media_player2.c', - 'eldbus_media_player2_player.h', - 'eldbus_mpris_media_player2.h', - 'eldbus_utils.h' - ] -) - shared_module(module, [src, gen_dbus] , -include_directories: include_directories(module_includes), -name_prefix: '', -dependencies : module_deps, -install_dir: dir_mod_bin, -install: true - ) -endif +no_icon = true --
Re: [E-devel] Enlightenment GitHub account and mirror
If you all decide on accepting PRs from Github. A Gentoo developer wrote a tool, Pull Request and Merge PRAM[1]. Its named Gentoo specific, but it is NOT Gentoo specific. It pulls a PR from Github, commits it to some other repo and closes the PR on Github. Thus you can accept PRs from github, with a 1 way read only mirror. I think it could be useful. https://github.com/monsieurp/Gentoo-App-Pram P.S. Accepting PRs on github should be an option. Github has attracted a large community and may see more contributions opening up that channel. That seems to be the case for many other projects. Not being a Github fan boy. But it is amazing and impressive how many use it, including major companies moving all repos there. Unlike I have seen with any other source code hoster. -- William L. Thomson Jr. pgpDB94nUfWBg.pgp Description: OpenPGP digital signature -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel