X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore%2Frb_ecore.c;h=0d18a9a3a3ea502e40d00de17d665a8b7a1d0d3c;hp=345ce0bfbc712285774573a92898b72dd59a9f74;hb=0f8d24c745efc1057f8d25ada1375c88a1ab2ed7;hpb=4f7cb64bdabb4d2c060644301bacf3fd3f46f053

diff --git a/src/ecore/rb_ecore.c b/src/ecore/rb_ecore.c
index 345ce0b..0d18a9a 100644
--- a/src/ecore/rb_ecore.c
+++ b/src/ecore/rb_ecore.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_ecore.c 361 2006-02-13 22:37:49Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
@@ -77,30 +75,6 @@ static VALUE m_time_get (VALUE self)
 	return rb_float_new (ecore_time_get ());
 }
 
-static VALUE m_new_event_type (VALUE self, VALUE klass)
-{
-	VALUE num;
-
-	num = INT2NUM (ecore_event_type_new());
-	rb_hash_aset (event_classes, num, klass);
-
-	return num;
-}
-
-static void free_ruby_event (void *data, void *event)
-{
-	/* do nothing */
-}
-
-static VALUE m_add_event (VALUE self, VALUE type, VALUE event)
-{
-	Check_Type (type, T_FIXNUM);
-
-	ecore_event_add (FIX2INT (type), (void *) event, free_ruby_event, NULL);
-
-	return Qnil;
-}
-
 #if 0
 static VALUE c_ev_exe_exit_init (VALUE self, VALUE event)
 {
@@ -183,9 +157,6 @@ void Init_ecore (void)
 	rb_define_module_function (mEcore, "main_loop_quit",
 	                           m_main_loop_quit, 0);
 	rb_define_module_function (mEcore, "time", m_time_get, 0);
-	rb_define_module_function (mEcore, "new_event_type",
-	                           m_new_event_type, 1);
-	rb_define_module_function (mEcore, "add_event", m_add_event, 2);
 
 	Init_Timer ();
 	Init_Animator ();
@@ -195,34 +166,32 @@ void Init_ecore (void)
 	Init_FdHandler ();
 
 	/* SIGNAL_HUP */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_HUP,
-	           "SignalHup", c);
-	rb_define_private_method (c, "initialize", c_ev_generic_init, 1);
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_HUP,
+	           "SignalHupEvent", c);
 
 	/* SIGNAL_POWER */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_POWER,
-	           "SignalPower", c);
-	rb_define_private_method (c, "initialize", c_ev_generic_init, 1);
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_POWER,
+	           "SignalPowerEvent", c);
 
 #if 0
 	/* EXE_EXIT */
-	ADD_EVENT (mEcore, ECORE_EVENT_, EXE_EXIT, "ExeExit", c);
+	ADD_EVENT (mEcore, ECORE_EVENT_EXE_EXIT, "ExeExitEvent", c);
 	rb_define_private_method (c, "initialize", c_ev_exe_exit_init, 1);
 #endif
 
 	/* SIGNAL_USER */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_USER,
-	           "SignalUser", c);
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_USER,
+	           "SignalUserEvent", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_user_init, 1);
 
 	/* SIGNAL_EXIT */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_EXIT,
-	           "SignalExit", c);
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_EXIT,
+	           "SignalExitEvent", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_exit_init, 1);
 
 	/* SIGNAL_REALTIME */
-	ADD_EVENT (mEcore, ECORE_EVENT_, SIGNAL_REALTIME,
-	           "SignalRealtime", c);
+	ADD_EVENT (mEcore, ECORE_EVENT_SIGNAL_REALTIME,
+	           "SignalRealtimeEvent", c);
 	rb_define_private_method (c, "initialize", c_ev_sig_rt_init, 1);
 }