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

[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 <bill...@gmail.com>
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

--