[seed] [libseed] Fix gtype-gtype.js test
- From: Robert Carr <racarr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [seed] [libseed] Fix gtype-gtype.js test
- Date: Sat, 1 Aug 2009 03:48:33 +0000 (UTC)
commit 00f9a08b7a743c1d9a644f65ed40ff9dc20856ab
Author: Robert Carr <racarr gnome org>
Date: Fri Jul 31 23:48:29 2009 -0400
[libseed] Fix gtype-gtype.js test
libseed/seed-gtype.c | 3 +++
tests/javascript/gtypes/gtype-gtype.js | 15 ++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/libseed/seed-gtype.c b/libseed/seed-gtype.c
index 0f917a9..e13a1b2 100644
--- a/libseed/seed-gtype.c
+++ b/libseed/seed-gtype.c
@@ -341,6 +341,7 @@ seed_gtype_construct (GType type,
if (parent_class->constructor == seed_gtype_construct)
{
+ GType t = parent;
parent = g_type_parent (parent);
g_type_class_unref (parent_class);
@@ -349,6 +350,8 @@ seed_gtype_construct (GType type,
object =
parent_class->constructor (type, n_construct_params,
construct_params);
+
+ seed_gtype_call_construct (t, object);
g_type_class_unref (parent_class);
}
diff --git a/tests/javascript/gtypes/gtype-gtype.js b/tests/javascript/gtypes/gtype-gtype.js
index b34c631..88d8a00 100755
--- a/tests/javascript/gtypes/gtype-gtype.js
+++ b/tests/javascript/gtypes/gtype-gtype.js
@@ -1,15 +1,17 @@
#!/usr/bin/env seed
// Returns: 0
// STDIN:
-// STDOUT:
+// STDOUT:Hi\nHi\nbye
// STDERR:
-
Gtk = imports.gi.Gtk;
Gtk.init(Seed.argv);
HelloWindowType = {
- parent: Gtk.Window.type,
- name: "HelloWindow"
+ parent: Gtk.Window.type,
+ name: "HelloWindow",
+ init: function(){
+ print("Hi");
+ }
};
HelloWindow = new GType(HelloWindowType);
@@ -17,7 +19,10 @@ w = new HelloWindow();
InheritedWindowType = {
parent: HelloWindow.type,
- name: "InheritedWindow"
+ name: "InheritedWindow",
+ init: function(){
+ print("bye");
+ }
};
InheritedWindow = new GType(InheritedWindowType);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]