From cfa8aace263c516603ad38add15e4adcaa7b9cd7 Mon Sep 17 00:00:00 2001
From: cpk <cpk>
Date: Wed, 17 Oct 2001 22:53:23 +0000
Subject: [PATCH] Oopsie ... bit too much!

SVN revision: 5512
---
 src/actions.c |  8 ++++----
 src/keys.c    | 18 +++++++++---------
 src/keys.h    |  6 +++---
 src/main.c    |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/actions.c b/src/actions.c
index 7ac5bcc70..1344cb108 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -140,9 +140,9 @@ e_action_find(char *action, E_Action_Type act, int button, char *key, Ecore_Even
 	if ((a->key) && (strlen(a->key) > 0))
 	  {
 	     if (a->modifiers == -1)
-	       ecore_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
+	       e_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
 	     else
-	       ecore_keys_grab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
+	       e_keys_grab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
 	     a->grabbed = 1;
 	  }
      }
@@ -210,9 +210,9 @@ e_action_free(E_Action *a)
    if ((a->key) && (strlen(a->key) > 0) && (a->grabbed))
      {
 	if (a->modifiers == -1)
-	  ecore_keys_ungrab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
+	  e_keys_ungrab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
 	else
-	  ecore_keys_ungrab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
+	  e_keys_ungrab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0);
      }
    IF_FREE(a->name);
    IF_FREE(a->action);
diff --git a/src/keys.c b/src/keys.c
index e3bf8884a..4fafb8451 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -1,11 +1,11 @@
 #include "keys.h"
 #include "actions.h"
 
-static void ecore_key_down(Ecore_Event * ev);
-static void ecore_key_up(Ecore_Event * ev);
+static void e_key_down(Ecore_Event * ev);
+static void e_key_up(Ecore_Event * ev);
 
 static void 
-ecore_key_down(Ecore_Event * ev)
+e_key_down(Ecore_Event * ev)
 {
    Ecore_Event_Key_Down          *e;
    
@@ -20,7 +20,7 @@ ecore_key_down(Ecore_Event * ev)
 }
 
 static void 
-ecore_key_up(Ecore_Event * ev)
+e_key_up(Ecore_Event * ev)
 {
    Ecore_Event_Key_Up          *e;
    
@@ -35,23 +35,23 @@ ecore_key_up(Ecore_Event * ev)
 }
 
 void
-ecore_keys_init(void)
+e_keys_init(void)
 {
    /* load up our actions .... once to get some grabbed keys */
    e_action_start("", ACT_KEY_DOWN, 0, NULL, ECORE_EVENT_KEY_MODIFIER_NONE,
 		  NULL, NULL, 0, 0, 0, 0);   
-   ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN,                 ecore_key_down);
-   ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP,                   ecore_key_up);
+   ecore_event_filter_handler_add(ECORE_EVENT_KEY_DOWN,                 e_key_down);
+   ecore_event_filter_handler_add(ECORE_EVENT_KEY_UP,                   e_key_up);
 }
 
 void
-ecore_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
+e_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
 {
    ecore_key_grab(key, mods, anymod, 0);
 }
 
 void
-ecore_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
+e_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod)
 {
    ecore_key_ungrab(key, mods, anymod);
 }
diff --git a/src/keys.h b/src/keys.h
index 2597c8d84..60b4fed33 100644
--- a/src/keys.h
+++ b/src/keys.h
@@ -3,8 +3,8 @@
 
 #include "e.h"
 
-void     ecore_keys_init(void);
-void     ecore_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
-void     ecore_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
+void     e_keys_init(void);
+void     e_keys_grab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
+void     e_keys_ungrab(char *key, Ecore_Event_Key_Modifiers mods, int anymod);
 
 #endif
diff --git a/src/main.c b/src/main.c
index 0bd4cb13d..8fc8f421d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -125,7 +125,7 @@ main(int argc, char **argv)
    e_menu_init();
    e_view_init();
    e_entry_init();
-   ecore_keys_init();
+   e_keys_init();
    e_guides_init();
    e_place_init();
    e_cursors_init();