From 9af608c8ef88aadac161a557b27822c9defa39f0 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat, 19 Jun 2004 18:55:39 +0000
Subject: [PATCH] Added keywords, updated GET_OBJ macro.

---
 AUTHORS              |  2 +-
 Makefile.am          |  2 +-
 autogen.sh           |  2 +-
 configure.ac         |  2 +-
 m4/Makefile.am       |  2 +-
 src/Makefile.am      |  2 +-
 src/rb_evas.c        |  2 +-
 src/rb_evas.h        |  2 +-
 src/rb_evas_object.c | 24 ++++++++++++------------
 src/rb_evas_object.h |  2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7422397..3c4d2cf 100644
--- 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)
diff --git a/Makefile.am b/Makefile.am
index 02cbb8d..b0de932 100644
--- 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
diff --git a/autogen.sh b/autogen.sh
index 265eff7..d496b8b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -58,5 +58,5 @@ test -f Makefile.in || \
 ) || exit 1
 
 echo
-echo "Type './configure' to configure ruby-ecore."
+echo "Type './configure' to configure ruby-evas."
 echo
diff --git a/configure.ac b/configure.ac
index 14142c6..ef48236 100644
--- 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])
diff --git a/m4/Makefile.am b/m4/Makefile.am
index f9e1214..1171506 100644
--- 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
diff --git a/src/Makefile.am b/src/Makefile.am
index 36f831e..5f26938 100644
--- 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)
diff --git a/src/rb_evas.c b/src/rb_evas.c
index eeacdd5..2ba53d1 100644
--- 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)
  *
diff --git a/src/rb_evas.h b/src/rb_evas.h
index eef5277..5bf0cf5 100644
--- 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)
  *
diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index 57dd2a6..cd448bf 100644
--- 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)
  *
@@ -24,13 +24,13 @@
 
 #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; \
 	}
 
@@ -56,7 +56,7 @@ void c_evas_object_mark (Evas_Object **e)
 
 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);
 
@@ -65,7 +65,7 @@ static VALUE c_init (VALUE self, VALUE parent)
 
 static VALUE c_delete (VALUE self)
 {
-	GET_OBJ (self, e);
+	GET_OBJ (self, Evas_Object, e, "EvasObject");
 
 	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)
 {
-	GET_OBJ (self, e);
+	GET_OBJ (self, Evas_Object, e, "EvasObject");
 
 	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)
 {
-	GET_OBJ (self, e);
+	GET_OBJ (self, Evas_Object, e, "EvasObject");
 
 	evas_object_show (*e);
 
@@ -99,7 +99,7 @@ static VALUE c_show (VALUE self)
 
 static VALUE c_hide (VALUE self)
 {
-	GET_OBJ (self, e);
+	GET_OBJ (self, Evas_Object, e, "EvasObject");
 
 	evas_object_hide (*e);
 
@@ -108,7 +108,7 @@ static VALUE c_hide (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;
 }
diff --git a/src/rb_evas_object.h b/src/rb_evas_object.h
index 9f0c73e..0218881 100644
--- 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)
  *
-- 
2.30.2