X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_evas%2Frb_gl_x11.c;h=061517afb8df7e704dfbc84753f27d0f1e780299;hb=f3e4005cf0cfdefa25cfd5187a67a4f456fe697f;hp=523f1af362ce21229abe81eb398f807ffc532e1d;hpb=627a83d5b49b1abd92bd73a10a56042a6d202dfa;p=ruby-ecore.git

diff --git a/src/ecore_evas/rb_gl_x11.c b/src/ecore_evas/rb_gl_x11.c
index 523f1af..061517a 100644
--- a/src/ecore_evas/rb_gl_x11.c
+++ b/src/ecore_evas/rb_gl_x11.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: rb_gl_x11.c 25 2004-06-26 23:07:01Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -25,14 +25,12 @@
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-VALUE cSoftwareX11;
-
 static VALUE c_init (int argc, VALUE *argv, VALUE self)
 {
 	VALUE disp, parent, geom[4];
 	Ecore_Evas **ee = NULL;
 	char *cdisp = NULL;
-	int i, igeom[4] = {0};
+	int i, igeom[4] = {0, 0, 0, 0};
 
 	Data_Get_Struct (self, Ecore_Evas *, ee);
 
@@ -41,7 +39,7 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
 
 	if (!NIL_P (disp)) {
 		Check_Type (disp, T_STRING);
-		cdisp = STR2CSTR (disp);
+		cdisp = StringValuePtr (disp);
 	}
 
 	for (i = 0; i < 4; i++)
@@ -50,9 +48,9 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
 			igeom[i] = NUM2INT (geom[i]);
 		}
 
-	*ee = ecore_evas_software_x11_new (cdisp, 0,
-	                                   igeom[0], igeom[1],
-	                                   igeom[2], igeom[3]);
+	*ee = ecore_evas_gl_x11_new (cdisp, 0,
+	                             igeom[0], igeom[1],
+	                             igeom[2], igeom[3]);
 
 	return self;
 }
@@ -70,13 +68,11 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 	return self;
 }
 
-void Init_SoftwareX11 (void)
+void Init_GlX11 (void)
 {
-	cSoftwareX11 = rb_define_class_under (mEvas,
-	                                      "SoftwareX11",
-	                                      cEcoreEvas);
+	VALUE cGlX11 = rb_define_class_under (mEvas, "GlX11", cEcoreEvas);
 
-	rb_define_singleton_method (cSoftwareX11, "new", c_new, -1);
-	rb_define_method (cSoftwareX11, "initialize", c_init, -1);
+	rb_define_singleton_method (cGlX11, "new", c_new, -1);
+	rb_define_method (cGlX11, "initialize", c_init, -1);
 }