Index: src/main.c
===================================================================
RCS file: /cvs/gnome/gob/src/main.c,v
retrieving revision 1.130
diff -u -r1.130 main.c
--- src/main.c	22 Jul 2005 19:56:32 -0000	1.130
+++ src/main.c	23 Jul 2005 14:57:25 -0000
@@ -618,7 +618,7 @@
 				 "id", "init",
 				 "args:steal", make_func_arg (cl->otype,
 							      FALSE /* is_class */,
-							      "o" /* name */),
+							      "self" /* name */),
 				 "unique_id", method_unique_id++,
 				 NULL);
 		cl->nodes = g_list_prepend(cl->nodes, node);
@@ -2001,6 +2001,9 @@
 print_initializer(Method *m, Variable *v)
 {
 	char *root;
+	
+	if(v->glade_widget)
+		return;
 
 	if(v->initializer == NULL)
 		return;
Index: src/parse.y
===================================================================
RCS file: /cvs/gnome/gob/src/parse.y,v
retrieving revision 1.66
diff -u -r1.66 parse.y
--- src/parse.y	22 Jul 2005 19:49:46 -0000	1.66
+++ src/parse.y	23 Jul 2005 14:57:29 -0000
@@ -481,11 +481,11 @@
 				 NULL);
 	initializer = g_strdup_printf("\t{\n"
 				      "\tGtkWidget * root;\n"
-				      "\to->_priv->_glade_xml = glade_xml_new(%s, %s, %s);\n"
-				      "\troot = glade_xml_get_widget(o->_priv->_glade_xml, %s);\n"
+				      "\tself->_priv->_glade_xml = glade_xml_new(%s, %s, %s);\n"
+				      "\troot = glade_xml_get_widget(self->_priv->_glade_xml, %s);\n"
 				      "\tgtk_widget_show(root);\n"
-				      "\tgtk_container_add(GTK_CONTAINER(o), root);\n"
-				      "\tglade_xml_signal_autoconnect_full(o->_priv->_glade_xml, (GladeXMLConnectFunc)___glade_xml_connect_foreach, (gpointer)o);\n"
+				      "\tgtk_container_add(GTK_CONTAINER(self), root);\n"
+				      "\tglade_xml_signal_autoconnect_full(self->_priv->_glade_xml, (GladeXMLConnectFunc)___glade_xml_connect_foreach, (gpointer)self);\n"
 				      "}\n", file, root, domain ? domain : "NULL", root);
 	
 	var = node_new (VARIABLE_NODE,