projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ecore_init and ecore_shutdown aren't exported anymore.
[ruby-ecore.git]
/
src
/
ecore_job
/
rb_job.c
diff --git
a/src/ecore_job/rb_job.c
b/src/ecore_job/rb_job.c
index 255c1d6527ff7939f2607e00ad8b5209469ea356..e0b1691054f4dcc2ab36ec5855cadc6cd0c53e3d 100644
(file)
--- a/
src/ecore_job/rb_job.c
+++ b/
src/ecore_job/rb_job.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_job.c 2
5 2004-06-26 23:07:01
Z tilman $
+ * $Id: rb_job.c 2
7 2004-07-08 18:25:05
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-20,6
+20,7
@@
#include <ruby.h>
#include <ruby.h>
+#include <Ecore.h>
#include <Ecore_Job.h>
#include <stdbool.h>
#include <Ecore_Job.h>
#include <stdbool.h>
@@
-41,23
+42,13
@@
static void on_job (void *data)
job->deleted = true;
}
job->deleted = true;
}
-static VALUE c_init (VALUE self)
-{
- RbEcoreJob *job = NULL;
-
- Data_Get_Struct (self, RbEcoreJob, job);
-
- job->cb = (void *) rb_block_proc ();
- job->job = ecore_job_add (on_job, job);
-
- return self;
-}
-
static void c_free (RbEcoreJob *job)
{
if (job->job && !job->deleted)
ecore_job_del (job->job);
static void c_free (RbEcoreJob *job)
{
if (job->job && !job->deleted)
ecore_job_del (job->job);
+ ecore_shutdown ();
+
free (job);
}
free (job);
}
@@
-66,8
+57,16
@@
static VALUE c_new (VALUE klass)
VALUE self;
RbEcoreJob *job;
VALUE self;
RbEcoreJob *job;
+ if (!rb_block_given_p ())
+ return Qnil;
+
self = Data_Make_Struct (klass, RbEcoreJob, NULL, c_free, job);
self = Data_Make_Struct (klass, RbEcoreJob, NULL, c_free, job);
+ ecore_init ();
+
+ job->cb = (void *) rb_block_proc ();
+ job->job = ecore_job_add (on_job, job);
+
rb_obj_call_init (self, 0, NULL);
return self;
rb_obj_call_init (self, 0, NULL);
return self;
@@
-95,7
+94,6
@@
void Init_Job (void)
cJob = rb_define_class_under (mJob, "Job", rb_cObject);
rb_define_singleton_method (cJob, "new", c_new, 0);
cJob = rb_define_class_under (mJob, "Job", rb_cObject);
rb_define_singleton_method (cJob, "new", c_new, 0);
- rb_define_method (cJob, "initialize", c_init, 0);
rb_define_method (cJob, "delete", c_delete, 0);
}
rb_define_method (cJob, "delete", c_delete, 0);
}