Added keywords, updated GET_OBJ macro.

diff --git a/AUTHORS b/AUTHORS
index 7422397586ca7603cfba9075feb3de3666d0b883..3c4d2cfa035c764784ed68426ebe06f6b63f67b5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,3 @@
-$Id$
+$Id: AUTHORS 2 2004-06-19 18:55:39Z tilman $

 
 Tilman Sauerbeck (tilman at code-monkey de)
 
 Tilman Sauerbeck (tilman at code-monkey de)

diff --git a/Makefile.am b/Makefile.am
index 02cbb8d5fec4b61817bb4beff2063a952f5b25da..b0de93285032b5b1043816e8d69d8267560ee121 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-## $Id$
+## $Id: Makefile.am 2 2004-06-19 18:55:39Z tilman $

 
 SUBDIRS = m4 src
 
 SUBDIRS = m4 src

diff --git a/autogen.sh b/autogen.sh
index 265eff76e548fafceb62e598597d0f6f43037906..d496b8b0b5ae30d456de735b0e6b0f66b338efef 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -58,5 +58,5 @@ test -f Makefile.in || \
 ) || exit 1
 
 echo
 ) || exit 1
 
 echo

-echo "Type './configure' to configure ruby-ecore."
+echo "Type './configure' to configure ruby-evas."

 echo
 echo

diff --git a/configure.ac b/configure.ac
index 14142c63ac269bd803b4e9d6bddcb739e8f51969..ef48236d2e6d741548bb9bd56462c92001dc0f7e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id$
+dnl $Id: configure.ac 2 2004-06-19 18:55:39Z tilman $

 
 AC_INIT(ruby-evas, 0.0.1)
 AC_CONFIG_SRCDIR([src/rb_evas.c])
 
 AC_INIT(ruby-evas, 0.0.1)
 AC_CONFIG_SRCDIR([src/rb_evas.c])

diff --git a/m4/Makefile.am b/m4/Makefile.am
index f9e1214c1b4dd4a43a8aef5b1b8bf56e31911bc9..11715067c23fcca7c573875bd3c5bf9ee2b46f3c 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,3 +1,3 @@
-## $Id$
+## $Id: Makefile.am 2 2004-06-19 18:55:39Z tilman $

 
 EXTRA_DIST = ac_path_generic.m4 ac_ruby_ext.m4
 
 EXTRA_DIST = ac_path_generic.m4 ac_ruby_ext.m4

diff --git a/src/Makefile.am b/src/Makefile.am
index 36f831e1c09a47a2f1624c549554bc0798a99771..5f269383250c1363260ad7c2626e2e0e86c05a05 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id$
+## $Id: Makefile.am 2 2004-06-19 18:55:39Z tilman $

 
 AM_CFLAGS = $(EVAS_CFLAGS)
 INCLUDES = -I$(RUBYDIR)
 
 AM_CFLAGS = $(EVAS_CFLAGS)
 INCLUDES = -I$(RUBYDIR)

diff --git a/src/rb_evas.c b/src/rb_evas.c
index eeacdd5adf43c5ec0143d3af90670062ddeb704a..2ba53d174d0f8c5b1f0f9c74ff47fd6acdcd9644 100644 (file)
--- a/src/rb_evas.c
+++ b/src/rb_evas.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id$
+ * $Id: rb_evas.c 2 2004-06-19 18:55:39Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *

diff --git a/src/rb_evas.h b/src/rb_evas.h
index eef52779e213118186df57fbe5e21d6898edfc92..5bf0cf53d0f404d654a125f5873c0a8df7ee1b87 100644 (file)
--- a/src/rb_evas.h
+++ b/src/rb_evas.h
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id$
+ * $Id: rb_evas.h 2 2004-06-19 18:55:39Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index 57dd2a6a946275472dc953e84b70ecb556db87c5..cd448bfa76dfc29cca84372d90262a9cce6f9eb5 100644 (file)
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id$
+ * $Id: rb_evas_object.c 2 2004-06-19 18:55:39Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -24,13 +24,13 @@
 
 #include "rb_evas_object.h"
 
 
 #include "rb_evas_object.h"
 

-#define GET_OBJ(obj, e) \
-       Evas_Object **(e) = NULL; \
+#define GET_OBJ(obj, type, o, desc) \
+       type **(o) = NULL; \

 \
 \

-       Data_Get_Struct ((obj), Evas_Object *, (e)); \
+       Data_Get_Struct ((obj), type *, (o)); \

 \
 \

-       if (!*(e)) { \
-               rb_raise (rb_eException, "EvasObject destroyed already"); \
+       if (!*(o)) { \
+               rb_raise (rb_eException, desc " destroyed already"); \

                return Qnil; \
        }
 
                return Qnil; \
        }
 


@@ -56,7 +56,7 @@ void c_evas_object_mark (Evas_Object **e)
 
 static VALUE c_init (VALUE self, VALUE parent)
 {
 
 static VALUE c_init (VALUE self, VALUE parent)
 {

-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");

 
        rb_hash_aset (parents, INT2NUM ((long) e), parent);
 
 
        rb_hash_aset (parents, INT2NUM ((long) e), parent);
 


@@ -65,7 +65,7 @@ static VALUE c_init (VALUE self, VALUE parent)
 
 static VALUE c_delete (VALUE self)
 {
 
 static VALUE c_delete (VALUE self)
 {

-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");

 
        if (*e) {
                evas_object_del (*e);
 
        if (*e) {
                evas_object_del (*e);


@@ -77,7 +77,7 @@ static VALUE c_delete (VALUE self)
 
 static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 {
 
 static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 {

-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");

 
        Check_Type (w, T_FIXNUM);
        Check_Type (h, T_FIXNUM);
 
        Check_Type (w, T_FIXNUM);
        Check_Type (h, T_FIXNUM);


@@ -90,7 +90,7 @@ static VALUE c_resize (VALUE self, VALUE w, VALUE h)
 
 static VALUE c_show (VALUE self)
 {
 
 static VALUE c_show (VALUE self)
 {

-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");

 
        evas_object_show (*e);
 
 
        evas_object_show (*e);
 


@@ -99,7 +99,7 @@ static VALUE c_show (VALUE self)
 
 static VALUE c_hide (VALUE self)
 {
 
 static VALUE c_hide (VALUE self)
 {

-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");

 
        evas_object_hide (*e);
 
 
        evas_object_hide (*e);
 


@@ -108,7 +108,7 @@ static VALUE c_hide (VALUE self)
 
 static VALUE c_is_visible (VALUE self)
 {
 
 static VALUE c_is_visible (VALUE self)
 {

-       GET_OBJ (self, e);
+       GET_OBJ (self, Evas_Object, e, "EvasObject");

 
        return evas_object_visible_get (*e) ? Qtrue : Qfalse;
 }
 
        return evas_object_visible_get (*e) ? Qtrue : Qfalse;
 }

diff --git a/src/rb_evas_object.h b/src/rb_evas_object.h
index 9f0c73e5da4e73ca38a0ca409f9c8ac69d2c9cac..02188816777047b6c65eb3f6a86c69093a8829b0 100644 (file)
--- a/src/rb_evas_object.h
+++ b/src/rb_evas_object.h
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id$
+ * $Id: rb_evas_object.h 2 2004-06-19 18:55:39Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *