[EGIT] [tools/enventor] master 01/01: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=4d3c94cf64998f0c59c2c8583daafa0aab55121b

commit 4d3c94cf64998f0c59c2c8583daafa0aab55121b
Author: Hermet Park <her...@hermet.pe.kr>
Date:   Fri Jan 22 20:22:46 2016 +0900

    code refactoring.
    
    goto_close(), search_close() returns a result in order that the caller 
decides a next behavior.
---
 src/bin/goto.c       |  6 ++++--
 src/bin/search.c     |  6 ++++--
 src/bin/tools.c      | 12 ++++++------
 src/include/goto.h   |  2 +-
 src/include/search.h |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/bin/goto.c b/src/bin/goto.c
index a10cbe3..fb1245e 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -214,11 +214,11 @@ goto_is_opened(void)
    return (gd ? EINA_TRUE : EINA_FALSE);
 }
 
-void
+Eina_Bool
 goto_close(void)
 {
    goto_data *gd = g_gd;
-   if (!gd) return;
+   if (!gd) return EINA_FALSE;
 
    //Save last state
    evas_object_geometry_get(gd->win, NULL, NULL, &win_w, &win_h);
@@ -230,4 +230,6 @@ goto_close(void)
    g_gd = NULL;
 
    tools_goto_update();
+
+   return EINA_TRUE;
 }
diff --git a/src/bin/search.c b/src/bin/search.c
index 9e570ca..1d6ae13 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -443,11 +443,11 @@ search_is_opened(void)
    return (sd ? EINA_TRUE : EINA_FALSE);
 }
 
-void
+Eina_Bool
 search_close(void)
 {
    search_data *sd = g_sd;
-   if (!sd) return;
+   if (!sd) return EINA_FALSE;
 
    Evas_Object *enventor = base_enventor_get();
 
@@ -466,4 +466,6 @@ search_close(void)
    g_sd = NULL;
 
    tools_search_update();
+
+   return EINA_TRUE;
 }
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 1708df8..5fa5657 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -25,8 +25,8 @@ menu_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
         void *event_info EINA_UNUSED)
 {
    live_edit_cancel();
-   if (search_is_opened()) search_close();
-   if (goto_is_opened()) tools_goto_update();
+   search_close();
+   tools_goto_update();
 
    menu_toggle();
 }
@@ -63,7 +63,7 @@ find_cb(void *data, Evas_Object *obj EINA_UNUSED,
         void *event_info EINA_UNUSED)
 {
    live_edit_cancel();
-   if (search_is_opened()) search_close();
+   if (search_close()) return;
    else search_open();
 }
 
@@ -72,7 +72,7 @@ goto_cb(void *data, Evas_Object *obj EINA_UNUSED,
         void *event_info EINA_UNUSED)
 {
    live_edit_cancel();
-   if (goto_is_opened()) goto_close();
+   if (goto_close()) return;
    else goto_open();
 }
 
@@ -90,8 +90,8 @@ static void
 live_edit_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
              void *event_info EINA_UNUSED)
 {
-   if (search_is_opened()) search_close();
-   if (goto_is_opened()) goto_close();
+   search_close();
+   goto_close();
    live_edit_toggle();
 }
 
diff --git a/src/include/goto.h b/src/include/goto.h
index c731e5c..18196dc 100644
--- a/src/include/goto.h
+++ b/src/include/goto.h
@@ -1,5 +1,5 @@
 #define DEFAULT_GOTO_WIN_W 330
 #define DEFAULT_GOTO_WIN_H 77
 void goto_open(void);
-void goto_close(void);
+Eina_Bool goto_close(void);
 Eina_Bool goto_is_opened(void);
diff --git a/src/include/search.h b/src/include/search.h
index 67e3694..f316cda 100644
--- a/src/include/search.h
+++ b/src/include/search.h
@@ -1,5 +1,5 @@
 #define DEFAULT_SEARCH_WIN_W 330
 #define DEFAULT_SEARCH_WIN_H 90
 void search_open(void);
-void search_close(void);
+Eina_Bool search_close(void);
 Eina_Bool search_is_opened(void);

--