--- e17.orig/apps/e/src/bin/e_bindings.h	2005-05-20 08:22:30.000000000 +0200
+++ e17/apps/e/src/bin/e_bindings.h	2005-05-20 08:20:25.000000000 +0200
@@ -13,19 +13,6 @@
    E_BINDING_CONTEXT_ANY
 } E_Binding_Context;
 
-/* why do we do this? config stored bindings must be fixed. x's modifier masks
- * may change from time to time, xserver to xserver - so we cant do a 
- * simple match without translating to fixed values
- */
-typedef enum _E_Binding_Modifier
-{
-   E_BINDING_MODIFIER_NONE = 0,
-   E_BINDING_MODIFIER_SHIFT = (1 << 0),
-   E_BINDING_MODIFIER_CTRL = (1 << 1),
-   E_BINDING_MODIFIER_ALT = (1 << 2),
-   E_BINDING_MODIFIER_WIN = (1 << 3)
-} E_Binding_Modifier;
-
 #else
 #ifndef E_BINDINGS_H
 #define E_BINDINGS_H
@@ -33,15 +20,15 @@
 EAPI int         e_bindings_init(void);
 EAPI int         e_bindings_shutdown(void);
 
-EAPI void        e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *params);
-EAPI void        e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *params);
+EAPI void        e_bindings_mouse_add(E_Binding_Context ctxt, int button, int mod, int any_mod, char *action, char *params);
+EAPI void        e_bindings_mouse_del(E_Binding_Context ctxt, int button, int mod, int any_mod, char *action, char *params);
 EAPI void        e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI void        e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI E_Action   *e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Button_Down *ev);
 EAPI E_Action   *e_bindings_mouse_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Button_Up *ev);
 
-EAPI void        e_bindings_key_add(E_Binding_Context ctxt, char *key, E_Binding_Modifier mod, int any_mod, char *action, char *params);
-EAPI void        e_bindings_key_del(E_Binding_Context ctxt, char *key, E_Binding_Modifier mod, int any_mod, char *action, char *params);
+EAPI void        e_bindings_key_add(E_Binding_Context ctxt, char *key, int mod, int any_mod, char *action, char *params);
+EAPI void        e_bindings_key_del(E_Binding_Context ctxt, char *key, int mod, int any_mod, char *action, char *params);
 EAPI void        e_bindings_key_grab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI void        e_bindings_key_ungrab(E_Binding_Context ctxt, Ecore_X_Window win);
 EAPI E_Action   *e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Key_Down *ev);