[EGIT] [apps/terminology] master 01/02: tytools - remove eina.h include from ty tools where really not needed

[Carsten Haitzler]

raster pushed a commit to branch master.

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

commit 3a14751b343c4b60f0ce58932ec0b1fdd0bac3ba
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Tue Dec 19 10:16:24 2017 +0900

    tytools - remove eina.h include from ty tools where really not needed
---
 src/bin/tyalpha.c  |  1 -
 src/bin/tybg.c     |  1 -
 src/bin/tycommon.c | 15 +++++----------
 src/bin/tycommon.h |  2 +-
 src/bin/typop.c    |  1 -
 src/bin/tyq.c      |  1 -
 src/bin/tysend.c   |  1 -
 7 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/bin/tyalpha.c b/src/bin/tyalpha.c
index e3c4c83..7facf72 100644
--- a/src/bin/tyalpha.c
+++ b/src/bin/tyalpha.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <Eina.h>
 #include "tycommon.h"
 
 static void
diff --git a/src/bin/tybg.c b/src/bin/tybg.c
index d2b7aaa..0067149 100644
--- a/src/bin/tybg.c
+++ b/src/bin/tybg.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <Eina.h>
 #include "tycommon.h"
 
 static void
diff --git a/src/bin/tycommon.c b/src/bin/tycommon.c
index df6c486..6b39fd5 100644
--- a/src/bin/tycommon.c
+++ b/src/bin/tycommon.c
@@ -4,19 +4,14 @@
 #include "tycommon.h"
 
 
-Eina_Bool
+int
 is_running_in_terminology(void)
 {
-   if (!getenv("TERMINOLOGY"))
-     return EINA_FALSE;
-
+   if (!getenv("TERMINOLOGY")) return 0;
    // Terminology's escape codes do not got through tmux
-   if (getenv("TMUX"))
-     return EINA_FALSE;
-
+   if (getenv("TMUX")) return 0;
    // Terminology's escape codes do not got through screen
-   if (getenv("STY"))
-     return EINA_FALSE;
+   if (getenv("STY")) return 0;
 
-   return EINA_TRUE;
+   return 1;
 }
diff --git a/src/bin/tycommon.h b/src/bin/tycommon.h
index 86f57a9..2d7cabd 100644
--- a/src/bin/tycommon.h
+++ b/src/bin/tycommon.h
@@ -1,7 +1,7 @@
 #ifndef _TY_COMMON_H__
 #define _TY_COMMON_H__ 1
 
-Eina_Bool is_running_in_terminology(void);
+int is_running_in_terminology(void);
 
 #define ON_NOT_RUNNING_IN_TERMINOLOGY_EXIT_1()                             \
   do                                                                       \
diff --git a/src/bin/typop.c b/src/bin/typop.c
index f314c91..5588c31 100644
--- a/src/bin/typop.c
+++ b/src/bin/typop.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <Eina.h>
 #include "tycommon.h"
 
 static void
diff --git a/src/bin/tyq.c b/src/bin/tyq.c
index aeae097..6dd2979 100644
--- a/src/bin/tyq.c
+++ b/src/bin/tyq.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <Eina.h>
 #include "tycommon.h"
 
 static void
diff --git a/src/bin/tysend.c b/src/bin/tysend.c
index 122a220..33ff5f0 100644
--- a/src/bin/tysend.c
+++ b/src/bin/tysend.c
@@ -9,7 +9,6 @@
 #include <fcntl.h>
 #include <termios.h>
 
-#include <Eina.h>
 #include "tycommon.h"
 
 static void

--