[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-10-16 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=688a45dc150e295a084b86d17d59dcd30ca54205

commit 688a45dc150e295a084b86d17d59dcd30ca54205
Merge: 951b415 fd2212a
Author: Boris Faure 
Date:   Thu Oct 17 00:11:13 2019 +0200

Merge branch 'terminology-1.5'

 Conflicts:
src/bin/options_font.c

 src/bin/options_font.c | 50 --
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --cc src/bin/options_font.c
index d90e7e9,f9f54ce..3945f6e
--- a/src/bin/options_font.c
+++ b/src/bin/options_font.c
@@@ -358,14 -361,16 +361,16 @@@ _cb_term_resize(void *data
  }
  
  static void
- _cb_font_del(void *data,
-  Evas *_e EINA_UNUSED,
-  Evas_Object *_obj EINA_UNUSED,
-  void *_event EINA_UNUSED)
+ _cb_font_bolditalic(void *data,
+ Evas_Object *obj,
+ void *_event EINA_UNUSED)
  {
 Font_Ctx *ctx = data;
-evas_object_event_callback_del_full(ctx->term, EVAS_CALLBACK_RESIZE,
-_cb_term_resize, ctx);
+Config *config = ctx->config;
+ 
+config->font.bolditalic = elm_check_state_get(obj);
+termio_config_update(ctx->term);
 -   config_save(config, NULL);
++   config_save(config);
  }
  
  static void

--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-10-14 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=bb6d54014528d423bce2a2a8e90fc2e73cbbfd26

commit bb6d54014528d423bce2a2a8e90fc2e73cbbfd26
Merge: e716ad5 96095b5
Author: Boris Faure 
Date:   Mon Oct 14 21:55:53 2019 +0200

Merge branch 'terminology-1.5'

 src/bin/win.c | 4 
 1 file changed, 4 insertions(+)


--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-10-01 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=109e804eae740bf4ecd9464f392af7f97b617d86

commit 109e804eae740bf4ecd9464f392af7f97b617d86
Merge: 43964c1 fe63070
Author: Boris Faure 
Date:   Tue Oct 1 22:44:24 2019 +0200

Merge branch 'terminology-1.5'

 src/bin/options_behavior.c | 1 +
 1 file changed, 1 insertion(+)


--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-09-29 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=9f156eb94842b6518ee15606de653539f46cffbb

commit 9f156eb94842b6518ee15606de653539f46cffbb
Merge: c11f7e4 61bb795
Author: Boris Faure 
Date:   Sun Sep 29 13:56:16 2019 +0200

Merge branch 'terminology-1.5'

 src/bin/sel.c | 46 ++
 1 file changed, 26 insertions(+), 20 deletions(-)

--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-09-16 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=0795c704265c092dc1e0fc2029e0df9f05ac718c

commit 0795c704265c092dc1e0fc2029e0df9f05ac718c
Merge: eb5b39c e33d07f
Author: Boris Faure 
Date:   Mon Sep 2 21:48:31 2019 +0200

Merge branch 'terminology-1.5'

 po/LINGUAS |   2 +-
 po/pl.po   | 928 +
 2 files changed, 929 insertions(+), 1 deletion(-)

--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-09-16 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=e0f27a46a6c31358b0954dcbf1df1aee75bc5902

commit e0f27a46a6c31358b0954dcbf1df1aee75bc5902
Merge: 0795c70 42e358d
Author: Boris Faure 
Date:   Mon Sep 2 23:00:24 2019 +0200

Merge branch 'terminology-1.5'

 tests/selection_in_history.sh | 16 
 tests/tests.results   |  3 ---
 2 files changed, 16 insertions(+), 3 deletions(-)

--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-09-15 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=48a8a93900419883c2aba7a88971764792e9668e

commit 48a8a93900419883c2aba7a88971764792e9668e
Merge: 448d583 f01c312
Author: Boris Faure 
Date:   Wed Sep 4 00:29:07 2019 +0200

Merge branch 'terminology-1.5'

 src/bin/sb.c | 1 +
 src/bin/termio.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-09-15 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=16f067cb0a0af15375814e75fdcc463d71950af6

commit 16f067cb0a0af15375814e75fdcc463d71950af6
Merge: e0f27a4 98017f1
Author: Boris Faure 
Date:   Mon Sep 2 23:28:48 2019 +0200

Merge branch 'terminology-1.5'

 src/bin/config.h   | 2 ++
 src/bin/options_behavior.c | 6 +++---
 src/bin/win.c  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-09-15 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=448d583ccdda1072d169d45b5448ba6ba9dd2f94

commit 448d583ccdda1072d169d45b5448ba6ba9dd2f94
Merge: 16f067c 421e40d
Author: Boris Faure 
Date:   Mon Sep 2 23:46:57 2019 +0200

Merge branch 'terminology-1.5'

 src/bin/termio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--

[EGIT] [apps/terminology] master 01/01: Merge branch 'terminology-1.5'

2019-09-15 Thread Boris Faure 
billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=9af03a621b5c8715d3235117947b0a0c257567fb

commit 9af03a621b5c8715d3235117947b0a0c257567fb
Merge: 3414c70 fcfd797
Author: Boris Faure 
Date:   Wed Aug 7 22:21:13 2019 +0200

Merge branch 'terminology-1.5'

 src/bin/options_keys.c | 1 +
 1 file changed, 1 insertion(+)

--