1 files changed, 19 insertions, 31 deletions

diff --git a/src/espik.c b/src/espik.c
index 8763f21..026fc64 100644
--- a/src/espik.c
+++ b/src/espik.c
@@ -11,38 +11,42 @@
 #include <Ecore_Data.h>			/* List */
 
 /* Espik Stuff */
-#include "espik.h"
 #include "espik_global.h"
 #include "espik_config.h"
 #include "espik_common_handler.h"
-#include "espik_debug.h"
+#include "espik.h"
 
 typedef int	(*Handler_Func) (void *data, int ev_type, void *ev);
 
-/*
-typedef int (*Handler_Fd_Func) (void *data, Ecore_Fd_Handler * fd_handler);
-*/
-
-static void espik_init(void)
-{
-	ptr_list = ecore_list_new();
-}
+/* typedef int (*Handler_Fd_Func) (void *data, Ecore_Fd_Handler * fd_handler); */
 
 static void espik_destroy_ptr(void *ptr)
 {
 	if (ptr)
 	{
-		espik_debug_print("Freeing data...");
+		printf ("Freeing data...");
 		free (ptr);
 		ptr = NULL;
 	}
 }
 
+static void espik_init(void)
+{
+	printf ("Welcome to %s-%s\n", APPS_NAME, ESPIK_VERSION);
+	ptr_list = ecore_list_new();
+	
+  if (!ecore_init ())
+	{
+		printf ("Cannot init ecore; %d\n", 1);
+		exit (-1);
+	}
+
+	ecore_list_set_free_cb (ptr_list, espik_destroy_ptr);
+}
+
 void espik_free (void *ptr)
 {
-	espik_enter();
 	ecore_list_append (ptr_list, ptr);
-	espik_leave();
 }
 
 void espik_shutdown(void)
@@ -54,9 +58,8 @@ void espik_shutdown(void)
 int del_backslash (char *msg)
 {
 	int	i, count;
-	espik_enter();
 
-	for (i = 0, count = 0; msg[i]; i++)
+	for (i = 0, count = 0 ; msg[i] ; i++)
 	{
 		if (msg[i] == '\n')
 		{
@@ -65,26 +68,14 @@ int del_backslash (char *msg)
 		}
 	}
 
-	espik_leave();
 	return (count);
 }
 
 int main (int argc, char **argv)
 {
 	Ecore_Fd_Handler       *fd_kb;
-	__indent_level = 0;
-	espik_enter();
-
-	printf ("Welcome to %s-%s\n", APPS_NAME, ESPIK_VERSION);
-	espik_init();
 
-	if (!ecore_init ())
-	{
-		printf ("Cannot init ecore; %d\n", 1);
-		exit (-1);
-	}
-
-	ecore_list_set_free_cb(ptr_list, espik_destroy_ptr);
+	espik_init ();
 	espik_config_init ();
 
 	if (argc < 3)
@@ -118,12 +109,9 @@ int main (int argc, char **argv)
 		exit (-1);
 	}
 	
-	/* Init IRC connection */
-
 	ecore_main_loop_begin ();
 
 	espik_shutdown();
-	espik_debug_print ("end");
 
 	espik_config_shutdown (a_infos);