some cleaning ...

3 files changed, 39 insertions, 17 deletions

diff --git a/elock.c b/elock.c
index cafa6aa..dcf4d81 100644
--- a/elock.c
+++ b/elock.c
@@ -6,21 +6,9 @@
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 
-#define WIDTH 400
-#define HEIGHT 400
-#define TIME 10
 
 /* ELCOK LIBS */
-/*#include "etimer.h"*/
-
-/* ELOCK FUNC DECLARATION */
-Ecore_Timer *elock_timer_callback(void *donnee);
-/*Ecore_Event_Handler *event_handler;*/
-Ecore_Timer *elock_timer (double laps);
-int check_args (int arg);	
-int elock_event_handler();
-int elock_event_cb (void *data, int ev_type, void *ev);
-void key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+#include "elock.h"
 
 /* TEMPORARY GLOBAL VARIABLE */
 
diff --git a/elock.h b/elock.h
new file mode 100644
index 0000000..97f5bfe
--- /dev/null
+++ b/elock.h
@@ -0,0 +1,25 @@
+#ifndef _HAVE_ELOCK_TIMER_H
+#define _HAVE_ELOCK_TIMER_H
+
+/*
+ *	ELOCK LIBRARY
+ *	by Philippe "Puppet_Master" Caseiro
+ *	05/07/2005
+ *	0.01
+ *	
+ */
+
+#define WIDTH 400
+#define HEIGHT 400
+#define TIME 10
+
+Ecore_Timer *elock_timer_callback(void *donnee);
+Ecore_Timer *elock_timer (double laps);
+
+int check_args (int arg);	
+int elock_event_handler();
+int elock_event_cb (void *data, int ev_type, void *ev);
+
+void key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+	
+#endif
diff --git a/etimer.h b/etimer.h
index 14fb319..97f5bfe 100644
--- a/etimer.h
+++ b/etimer.h
@@ -2,15 +2,24 @@
 #define _HAVE_ELOCK_TIMER_H
 
 /*
- *	ELOCK TIMER LIBRARY
+ *	ELOCK LIBRARY
  *	by Philippe "Puppet_Master" Caseiro
  *	05/07/2005
  *	0.01
  *	
  */
 
-	
-static int timer_one_cb(void *data)
-static int timer_two_cb(void *data)
+#define WIDTH 400
+#define HEIGHT 400
+#define TIME 10
+
+Ecore_Timer *elock_timer_callback(void *donnee);
+Ecore_Timer *elock_timer (double laps);
 
+int check_args (int arg);	
+int elock_event_handler();
+int elock_event_cb (void *data, int ev_type, void *ev);
+
+void key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+	
 #endif