[EGIT] [tools/eflete] master 38/56: shortcuts: fix init logic

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=496f3a63a1e5b8311e62f168e479adf621be8bdb

commit 496f3a63a1e5b8311e62f168e479adf621be8bdb
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date:   Fri Jul 17 11:09:59 2015 +0300

    shortcuts: fix init logic
---
 src/bin/config/config.c          |  1 -
 src/bin/ui/shortcuts/shortcuts.c | 11 ++++++-----
 src/bin/ui/shortcuts/shortcuts.h | 24 ------------------------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/bin/config/config.c b/src/bin/config/config.c
index 25538e0..e2268d5 100644
--- a/src/bin/config/config.c
+++ b/src/bin/config/config.c
@@ -370,7 +370,6 @@ config_load(App_Data *ap)
    profile_load(config->profile);
 
    shortcuts_profile_load(ap, profile_get());
-   shortcuts_main_add(ap);
 #ifdef HAVE_ENVENTOR
    enventor_object_profile_load(ap->enventor, profile_get());
 #endif /* HAVE_ENVENTOR */
diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c
index cbec46b..61d5a46 100644
--- a/src/bin/ui/shortcuts/shortcuts.c
+++ b/src/bin/ui/shortcuts/shortcuts.c
@@ -794,8 +794,8 @@ _eina_hash_free(void *data)
 #undef PART_ADD
 #undef PART_FUNCTIONALITY
 
-Eina_Bool
-shortcuts_main_add(App_Data *ap)
+static Eina_Bool
+_shortcuts_main_add(App_Data *ap)
 {
    assert(ap != NULL);
 
@@ -811,8 +811,8 @@ shortcuts_main_add(App_Data *ap)
    return true;
 }
 
-Eina_Bool
-shortcuts_main_del(App_Data *ap)
+static Eina_Bool
+_shortcuts_main_del(App_Data *ap)
 {
    assert(ap != NULL);
 
@@ -898,6 +898,7 @@ shortcuts_init(App_Data *ap)
         eina_hash_direct_add(_sc_functions, _sc_func_set->descr, 
_sc_func_set->func);
         _sc_func_set++;
      }
+   _shortcuts_main_add(ap);
 
    return true;
 }
@@ -911,7 +912,7 @@ shortcuts_shutdown(App_Data *ap)
 
    Key_Pair *key;
 
-   shortcuts_main_del(ap);
+   _shortcuts_main_del(ap);
 
    eina_hash_free(_sc_functions);
    _sc_functions = NULL;
diff --git a/src/bin/ui/shortcuts/shortcuts.h b/src/bin/ui/shortcuts/shortcuts.h
index ecec42a..3da6c3e 100644
--- a/src/bin/ui/shortcuts/shortcuts.h
+++ b/src/bin/ui/shortcuts/shortcuts.h
@@ -47,30 +47,6 @@
 #include "config.h"
 
 /**
- * Set up shortcuts for main window.
- *
- * @param ap Application Data.
- *
- * @return EINA_TRUE on success or EINA_FALSE, on errors.
- *
- * @ingroup Shortcuts
- */
-Eina_Bool
-shortcuts_main_add(App_Data *ap);
-
-/**
- * Unset shortcuts from main window.
- *
- * @param ap Application Data.
- *
- * @return EINA_TRUE on success or EINA_FALSE, on errors.
- *
- * @ingroup Shortcuts
- */
-Eina_Bool
-shortcuts_main_del(App_Data *ap);
-
-/**
  * Setting shortcuts from user's profile.
  *
  * @param ap Application Data.

--