Renamed the smart object callbacks from on_foo to smart_foo.

This avoids a naming clash with the event system.

diff --git a/src/rb_smart.c b/src/rb_smart.c
index 32a729d868519b9ef9bcc439a011e29cf0872685..5ede2ba65b0bebfeaf6b0da3b6e9dd081570fb1e 100644 (file)
--- a/src/rb_smart.c
+++ b/src/rb_smart.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_smart.c 381 2006-05-21 14:56:15Z tilman $
+ * $Id: rb_smart.c 387 2006-09-23 19:52:31Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -31,27 +31,27 @@
        static ID id; \
 \
        if (!id) \
-               id = rb_intern ("on_"#name); \
+               id = rb_intern ("smart_"#name); \
 \
        if (!rb_respond_to (self, id)) \
                return;
 
 #define SMART_CB(name) \
-       static void on_##name (Evas_Object *o) \
+       static void smart_##name (Evas_Object *o) \
        { \
                SMART_CB_BODY (name); \
                rb_funcall (self, id, 0); \
        }
 
 #define SMART_CB_OBJ(name) \
-       static void on_##name (Evas_Object *o, Evas_Object *other) \
+       static void smart_##name (Evas_Object *o, Evas_Object *other) \
        { \
                SMART_CB_BODY (name); \
                rb_funcall (self, id, 1, TO_EVAS_OBJECT (other)); \
        }
 
 #define SMART_CB_COORD(name) \
-       static void on_##name (Evas_Object *o, Evas_Coord a, Evas_Coord b) \
+       static void smart_##name (Evas_Object *o, Evas_Coord a, Evas_Coord b) \
        { \
                SMART_CB_BODY (name); \
                rb_funcall (self, id, 2, INT2FIX ((int) a), INT2FIX ((int) b)); \
@@ -67,7 +67,7 @@ SMART_CB_OBJ (clip_set);
 SMART_CB_COORD (move);
 SMART_CB_COORD (resize);
 
-static void on_color_set (Evas_Object *o, int r, int g, int b, int a)
+static void smart_color_set (Evas_Object *o, int r, int g, int b, int a)
 {
        SMART_CB_BODY (color_set);
 
@@ -103,11 +103,13 @@ static VALUE c_init (VALUE self, VALUE evas)
                smart = Data_Make_Struct (rb_cObject, Evas_Smart *, NULL, NULL, s);
 
                *s = evas_smart_new (StringValuePtr (name),
-                                    NULL, on_delete, NULL,
+                                    NULL, smart_delete, NULL,
                                     NULL, NULL, NULL, NULL,
-                                    on_move, on_resize,
-                                    on_show, on_hide, on_color_set,
-                                    on_clip_set, on_clip_unset, NULL);
+                                    smart_move, smart_resize,
+                                    smart_show, smart_hide,
+                                    smart_color_set,
+                                    smart_clip_set, smart_clip_unset,
+                                    NULL);
 
                rb_mod_remove_const(klass, ID2SYM (id_smart_object));
                rb_const_set (klass, id_smart_object, smart);