X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/489e97ede850a8de01ca3bd653dce9c25dcd54a1..4f0369e24277442e70d0edaab02b022bc7a2b6f5:/src/main.c

diff --git a/src/main.c b/src/main.c
index fce8cb0..f62f2f7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,9 +1,9 @@
 /* GOB C Preprocessor
  * Copyright (C) 1999,2000 the Free Software Foundation.
  * Copyright (C) 2000 Eazel, Inc.
- * Copyright (C) 2001 George Lebl
+ * Copyright (C) 2001-2004 George (Jiri) Lebl
  *
- * Author: George Lebl
+ * Author: George (Jiri) Lebl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@ extern GList *include_files;
 extern GHashTable *gtk_doc_hash;
 
 char *filebase;
+char *fullfilebase;
 static char *funcbase;
 static char *pfuncbase;
 static char *macrobase;
@@ -63,6 +64,10 @@ static char *pmacrotype;
 static char *typebase;
 static char *ptypebase;
 
+char *output_dir = NULL;
+
+static char file_sep = '-';
+
 static int signals = 0; /* number of signals */
 static int set_properties = 0; /* number of named (set) properties */
 static int get_properties = 0; /* number of named (get) properties */
@@ -82,8 +87,8 @@ static gboolean made_aliases = FALSE;  /* if we made any shorthand aliases
 static gboolean special_array[SPECIAL_LAST] = {0};
 static gboolean any_special = FALSE;
 
-static gboolean need_shutdown = FALSE;
-static Method * shutdown_handler = NULL;
+static gboolean need_dispose = FALSE;
+static Method * dispose_handler = NULL;
 
 static gboolean need_finalize = FALSE;
 static Method * finalize_handler = NULL;
@@ -119,17 +124,24 @@ int method_unique_id = 1;
 static void
 make_bases (void)
 {
-	filebase = replace_sep (((Class *)class)->otype, '-');
-	g_strdown (filebase);
+	filebase = replace_sep (((Class *)class)->otype, file_sep);
+	gob_strdown (filebase);
+
+	if (output_dir != NULL &&
+	    output_dir[0] != '\0') {
+		fullfilebase = g_build_filename (output_dir, filebase, NULL);
+	} else {
+		fullfilebase = g_strdup (filebase);
+	}
 
 	funcbase = replace_sep (((Class *)class)->otype, '_');
-	g_strdown (funcbase);
+	gob_strdown (funcbase);
 
 	pfuncbase = replace_sep (((Class *)class)->ptype, '_');
-	g_strdown (pfuncbase);
+	gob_strdown (pfuncbase);
 
 	macrobase = replace_sep (((Class *)class)->otype, '_');
-	g_strup (macrobase);
+	gob_strup (macrobase);
 	
 	macrois = make_pre_macro (((Class *)class)->otype, "IS");
 	pmacrois = make_pre_macro (((Class *)class)->ptype, "IS");
@@ -183,7 +195,9 @@ print_method (FILE *fp,
 	      const Method *m,
 	      gboolean one_arg_per_line,
 	      gboolean no_funcbase,
-	      gboolean kill_underscore)
+	      gboolean kill_underscore,
+	      gboolean first_unused,
+	      gboolean fake_names)
 {
 	GList *li;
 	const char *id;
@@ -204,16 +218,29 @@ print_method (FILE *fp,
 	if(m->args) {
 		for(li=m->args; li; li=g_list_next(li)) {
 			FuncArg *arg = li->data;
+			const char *unused = "";
+
+			if ( ! no_gnu &&
+			     ! for_cpp && /* g++ has a cow with this */
+			    li == m->args &&
+			    first_unused) {
+				unused = " G_GNUC_UNUSED";
+			}
+
 			print_type(fp, arg->atype, FALSE);
+			if (fake_names)
+				out_printf (fp, "___fake___");
 			if(li->next)
-				out_printf(fp, "%s%s,%s", arg->name,
+				out_printf(fp, "%s%s%s,%s", arg->name,
 					   arg->atype->postfix ?
 					   arg->atype->postfix : "",
+					   unused,
 					   one_arg_per_line ? "\n\t\t\t\t\t" : " ");
 			else
-				out_printf(fp, "%s%s", arg->name,
+				out_printf(fp, "%s%s%s", arg->name,
 					   arg->atype->postfix ?
-					   arg->atype->postfix : ""); 
+					   arg->atype->postfix : "",
+					   unused); 
 		}
 		if(m->vararg)
 			out_printf(fp, ",%s...",
@@ -246,9 +273,8 @@ any_method_to_alias(Class *c)
 }
 
 
-/* just the vararg macros, we use the same func pointers for these as in non-gnu */
 static void
-make_method_gnu_aliases(Class *c)
+make_method_aliases (Class *c)
 {
 	GList *li;
 	
@@ -262,55 +288,16 @@ make_method_gnu_aliases(Class *c)
 			   m->method == OVERRIDE_METHOD)
 				continue;
 
-			if(m->args != NULL)
-				out_printf(out, "#define self_%s(args...) "
-					   "%s_%s(args)\n", m->id,
-					   funcbase, m->id);
-			else
-				out_printf(out, "#define self_%s() "
-					   "%s_%s()\n", m->id,
-					   funcbase, m->id);
-		}
-	}
-}
-
-static void
-make_method_nongnu_aliases(Class *c)
-{
-	GList *li;
-
-	gboolean local_made_aliases = FALSE;
-	
-	for(li=c->nodes; li; li=g_list_next(li)) {
-		Node *node = li->data;
-		if(node->type == METHOD_NODE) {
-			Method *m = (Method *)node;
-			
-			if(m->method == INIT_METHOD ||
-			   m->method == CLASS_INIT_METHOD ||
-			   m->method == OVERRIDE_METHOD)
-				continue;
-
-			if( ! local_made_aliases)
-				out_printf(out, "\n/* Short form pointers */\n");
-
-			print_method(out, "static ", "(* const self_", "", ") ",
-				     "", "",
-				     m, FALSE, TRUE, FALSE);
-			out_printf(out, " = %s_%s;\n", funcbase,
-				   m->id);
-
-			local_made_aliases = TRUE;
+			out_printf (out, "#define self_%s %s_%s\n",
+				    m->id,
+				    funcbase,
+				    m->id);
 		}
 	}
-	if(local_made_aliases) {
-		out_printf(out, "\n");
-		made_aliases = TRUE;
-	}
 }
 
 static void
-add_bad_hack_to_avoid_unused_warnings(Class *c)
+add_bad_hack_to_avoid_unused_warnings(const Class *c)
 {
 	GList *li;
 
@@ -356,7 +343,7 @@ add_bad_hack_to_avoid_unused_warnings(Class *c)
 }
 
 static void
-put_variable(Variable *v, FILE *fp)
+put_variable(const Variable *v, FILE *fp)
 {
 	out_printf(fp, "\t");
 	print_type(fp, v->vtype, FALSE);
@@ -379,10 +366,10 @@ put_vs_method(const Method *m)
 	/* if a signal mark it as such */
 	if(m->method != VIRTUAL_METHOD)
 		print_method(outh, "\t/*signal*/", "(* ", "", ") ", "", ";\n",
-			     m, FALSE, TRUE, TRUE);
+			     m, FALSE, TRUE, TRUE, FALSE, FALSE);
 	else
 		print_method(outh, "\t", "(* ", "", ") ", "", ";\n",
-			     m, FALSE, TRUE, TRUE);
+			     m, FALSE, TRUE, TRUE, FALSE, FALSE);
 }
 
 static void
@@ -391,7 +378,8 @@ put_pub_method(const Method *m)
 	if(m->scope != PUBLIC_SCOPE)
 		return;
 
-	print_method(outh, "", "\t", "", "\t", "", ";\n", m, TRUE, FALSE, TRUE);
+	print_method(outh, "", "\t", "", "\t", "", ";\n", m,
+		     TRUE, FALSE, TRUE, FALSE, FALSE);
 }
 
 static void
@@ -424,35 +412,35 @@ put_signal_macro (const Method *m, gboolean gnu)
 		/* connect */
 		out_printf (outh, "#define %s_connect__%s(object,func,data)\t"
 			    "g_signal_connect("
-			    "%s(({%s *___object = (object); ___object; })),"
+			    "%s(__extension__ ({%s *___object = (object); ___object; })),"
 			    "\"%s\","
-			    "(GCallback)({",
+			    "(GCallback) __extension__ ({",
 			    funcbase, m->id, macrobase, typebase, m->id);
 		print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ",
-			      " = (func); ", m, FALSE, TRUE, TRUE);
+			      " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE);
 		out_printf (outh, "___%s; }), (data))\n", m->id);
 
 		/* connect_after */
 		out_printf (outh, "#define %s_connect_after__%s(object,func,data)\t"
 			    "g_signal_connect_after("
-			    "%s(({%s *___object = (object); ___object; })),"
+			    "%s(__extension__ ({%s *___object = (object); ___object; })),"
 			    "\"%s\","
-			    "(GCallback)({",
+			    "(GCallback) __extension__ ({",
 			    funcbase, m->id, macrobase, typebase, m->id);
 		print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ",
-			      " = (func); ", m, FALSE, TRUE, TRUE);
+			      " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE);
 		out_printf (outh, "___%s; }), (data))\n", m->id);
 
 		/* connect_data */
 		out_printf (outh, "#define %s_connect_data__%s"
 			    "(object,func,data,destroy_data,flags)\t"
 			    "g_signal_connect_data("
-			    "%s(({%s *___object = (object); ___object; })),"
+			    "%s(__extension__ ({%s *___object = (object); ___object; })),"
 			    "\"%s\","
-			    "(GCallback)({",
+			    "(GCallback) __extension__ ({",
 			    funcbase, m->id, macrobase, typebase, m->id);
 		print_method (outh, "", "(* ___", "", ") ", ", gpointer ___data ",
-			      " = (func); ", m, FALSE, TRUE, TRUE);
+			      " = (func); ", m, FALSE, TRUE, TRUE, FALSE, TRUE);
 		out_printf (outh, "___%s; }), (data), (destroy_data), (GConnectFlags)(flags))\n", m->id);
 	}
 }
@@ -519,14 +507,14 @@ put_prot_method(const Method *m)
 
 	if(outph)
 		print_method(outph, "", "\t", "", "\t", "", ";\n",
-			     m, FALSE, FALSE, TRUE);
+			     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 	else
 		print_method(out, "", "\t", "", "\t", "", ";\n",
-			     m, FALSE, FALSE, TRUE);
+			     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 }
 
 static void
-put_priv_method_prot(Method *m)
+put_priv_method_prot(const Method *m)
 {
 	if(m->method == SIGNAL_LAST_METHOD ||
 	   m->method == SIGNAL_FIRST_METHOD ||
@@ -534,7 +522,7 @@ put_priv_method_prot(Method *m)
 		if(m->cbuf)
 			print_method(out,
 				     "static ", "___real_", "", " ", "", ";\n",
-				     m, FALSE, FALSE, TRUE);
+				     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 	}
 	/* no else, here, it might still have a private prototype, it's not
 	 * exclusive */
@@ -545,14 +533,14 @@ put_priv_method_prot(Method *m)
 		char *s = g_strdup_printf("___%x_", (guint)m->unique_id);
 		print_method(out, "static ", s, "", " ", "",
 			     no_gnu?";\n":" G_GNUC_UNUSED;\n",
-			     m, FALSE, FALSE, FALSE);
+			     m, FALSE, FALSE, FALSE, FALSE, FALSE);
 		g_free(s);
 	} else if(m->scope == PRIVATE_SCOPE ||
 		  m->method == INIT_METHOD ||
 		  m->method == CLASS_INIT_METHOD) {
 		print_method(out, "static ", "", "", " ", "",
 			     no_gnu?";\n":" G_GNUC_UNUSED;\n",
-			     m, FALSE, FALSE, TRUE);
+			     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 	}
 }
 
@@ -636,30 +624,30 @@ make_inits(Class *cl)
 }
 
 static void
-find_shutdown(Class *cl)
+find_dispose(const Class *cl)
 {
 	GList *li;
 
-	shutdown_handler = NULL;
+	dispose_handler = NULL;
 	for(li=cl->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		if(n->type == METHOD_NODE) {
 			Method *m = (Method *)n;
 			if(m->method == OVERRIDE_METHOD &&
-			   strcmp(m->id, "shutdown")==0) {
+			   strcmp(m->id, "dispose")==0) {
 				if(strcmp(m->otype, "G:Object") != 0) {
 					error_print(GOB_ERROR, m->line_no,
-						    "shutdown method override "
+						    "dispose method override "
 						    "of class other then "
 						    "G:Object");
 				}
 				if(g_list_length(m->args) != 1) {
 					error_print(GOB_ERROR, m->line_no,
-						    "shutdown method override "
+						    "dispose method override "
 						    "with more then one "
 						    "parameter");
 				}
-				shutdown_handler = m;
+				dispose_handler = m;
 				break;
 			}
 		}
@@ -667,7 +655,7 @@ find_shutdown(Class *cl)
 }
 
 static void
-find_finalize(Class *cl)
+find_finalize(const Class *cl)
 {
 	GList *li;
 
@@ -708,7 +696,7 @@ static GList *eq_signal_methods = NULL;
 
 /* compare a list of strings */
 static gboolean
-is_list_equal(GList *a, GList *b)
+is_list_equal(const GList *a, const GList *b)
 {
 	for(;a && b; a=a->next, b=b->next) {
 		if(strcmp(a->data, b->data)!=0) {
@@ -722,7 +710,7 @@ is_list_equal(GList *a, GList *b)
 }
 
 static Method *
-find_same_type_signal(Method *m)
+find_same_type_signal(const Method *m)
 {
 	GList *li;
 	for(li=eq_signal_methods;li;li=li->next) {
@@ -734,7 +722,7 @@ find_same_type_signal(Method *m)
 }
 
 static void
-print_signal_marsal_args (Method *m)
+print_signal_marsal_args (const Method *m)
 {
 	if (strcmp (m->gtktypes->next->data, "NONE") != 0) {
 		GList *li;
@@ -742,9 +730,16 @@ print_signal_marsal_args (Method *m)
 		for (i = 0, li = m->gtktypes->next;
 		     li != NULL;
 		     i++, li = li->next) {
-			char *get_func = g_strdup_printf
-				("g_value_get_%s", (char *)li->data);
-			g_strdown (get_func);
+			char *get_func;
+
+			if (strcmp (li->data, "UNICHAR") == 0)
+				/* hack because glib is braindamaged */
+				get_func = g_strdup ("g_value_get_uint");
+			else
+				get_func = g_strdup_printf
+					("g_value_get_%s", (char *)li->data);
+
+			gob_strdown (get_func);
 			out_printf (out, ",\n\t\t(%s) "
 				    "%s (param_values + %d)",
 				    get_cast (li->data, FALSE),
@@ -766,6 +761,11 @@ add_signal_prots(Method *m)
 	gboolean ret_none = FALSE;
 	gboolean arglist_none = FALSE;
 	const char *retcast;
+	const char *unused = "";
+
+	if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) {
+		unused = " G_GNUC_UNUSED";
+	}
 	
 	if (m->method != SIGNAL_LAST_METHOD &&
 	    m->method != SIGNAL_FIRST_METHOD)
@@ -812,12 +812,15 @@ add_signal_prots(Method *m)
 	
 	out_printf (out, "\nstatic void\n"
 		    "___marshal_%s (GClosure *closure,\n"
-		    "\tGValue *return_value,\n"
+		    "\tGValue *return_value%s,\n"
 		    "\tguint n_param_values,\n"
 		    "\tconst GValue *param_values,\n"
-		    "\tgpointer invocation_hint,\n"
+		    "\tgpointer invocation_hint%s,\n"
 		    "\tgpointer marshal_data)\n"
-		    "{\n", s);
+		    "{\n",
+		    s,
+		    unused,
+		    unused);
 
 	if ( ! ret_none)
 		out_printf (out, "\t%s v_return;\n", retcast);
@@ -857,17 +860,30 @@ add_signal_prots(Method *m)
 		gboolean take_ownership = 
 			(strcmp ((char *)m->gtktypes->data, "STRING") == 0 ||
 			 strcmp ((char *)m->gtktypes->data, "BOXED") == 0);
-		char *set_func = g_strdup_printf ("g_value_set_%s%s",
-						  (char *)m->gtktypes->data,
-						  take_ownership ?
+		char *set_func;
+
+
+		if (strcmp (m->gtktypes->data, "UNICHAR") == 0)
+			/* hack because glib is braindamaged */
+			set_func = g_strdup ("g_value_set_uint");
+		else
+			set_func = g_strdup_printf ("g_value_set_%s%s",
+						    (char *)m->gtktypes->data,
+						    take_ownership ?
 						    "_take_ownership" : ""); 
-		g_strdown (set_func);
+		gob_strdown (set_func);
 
 		out_printf (out, "\n\t%s (return_value, v_return);\n",
 			    set_func);
 
 		g_free (set_func);
 	}
+	if (no_gnu || for_cpp /* g++ has a cow with G_GNUC_UNUSED */) {
+		if (ret_none)
+			out_printf (out, "\n\treturn_value = NULL;\n");
+		out_printf (out, "\tinvocation_hint = NULL;\n");
+
+	}
 	out_printf (out, "}\n\n");
 }
 
@@ -885,7 +901,7 @@ add_enums(Class *c)
 				if(m->method == SIGNAL_LAST_METHOD ||
 				   m->method == SIGNAL_FIRST_METHOD) {
 					char *s = g_strdup(m->id);
-					g_strup(s);
+					gob_strup(s);
 					out_printf(out, "\t%s_SIGNAL,\n", s);
 					g_free(s);
 				}
@@ -901,13 +917,13 @@ add_enums(Class *c)
 			if (n->type == PROPERTY_NODE) {
 				Property *p = (Property *)n;
 				char *s = g_strdup (p->name);
-				g_strup (s);
+				gob_strup (s);
 				out_printf (out, ",\n\tPROP_%s", s);
 				g_free(s);
 			} else if (n->type == ARGUMENT_NODE) {
 				Argument *a = (Argument *)n;
 				char *s = g_strdup(a->name);
-				g_strup(s);
+				gob_strup (s);
 				out_printf(out, ",\n\tPROP_%s", s);
 				g_free(s);
 			}
@@ -1039,13 +1055,13 @@ static void
 add_get_type(void)
 {
 	/*char *chunk_size = ((Class*)class)->chunk_size;*/
-	
+
 	out_printf(out,
 		   "GType\n"
 		   "%s_get_type (void)\n"
 		   "{\n"
 		   "\tstatic GType type = 0;\n\n"
-		   "\tif (type == 0) {\n"
+		   "\tif ___GOB_UNLIKELY(type == 0) {\n"
 		   "\t\tstatic const GTypeInfo info = {\n"
 		   "\t\t\tsizeof (%sClass),\n"
 		   "\t\t\t(GBaseInitFunc) NULL,\n"
@@ -1056,6 +1072,7 @@ add_get_type(void)
 		   "\t\t\tsizeof (%s),\n"
 		   "\t\t\t0 /* n_preallocs */,\n"
 		   "\t\t\t(GInstanceInitFunc) %s_init,\n"
+		   "\t\t\tNULL\n"
 		   "\t\t};\n\n",
 		   funcbase, typebase, funcbase, typebase, funcbase);
 
@@ -1098,7 +1115,7 @@ add_bonobo_object_get_type (void)
 		    "%s_get_type (void)\n" /* 1 */
 		    "{\n"
 		    "\tstatic GType type = 0;\n\n"
-		    "\tif (type == 0) {\n"
+		    "\tif ___GOB_UNLIKELY(type == 0) {\n"
 		    "\t\tstatic const GTypeInfo info = {\n"
 		    "\t\t\tsizeof (%sClass),\n" /* 2 */
 		    "\t\t\t(GBaseInitFunc) NULL,\n"
@@ -1174,7 +1191,7 @@ add_overrides(Class *c, const char *oname,
 		g_hash_table_insert(done, s, s);
 
 		f = replace_sep(m->otype, '_');
-		g_strdown(f);
+		gob_strdown(f);
 
 		out_printf(out, "\t%sClass *%s_class = (%sClass *)%s;\n",
 			   s, f, s, oname);
@@ -1268,7 +1285,7 @@ add_signals(Class *c)
 		is_none = (strcmp(m->gtktypes->next->data, "NONE")==0);
 
 		sig = g_strdup (m->id);
-		g_strup (sig);
+		gob_strup (sig);
 		flags = make_run_signal_flags (m, last);
 		out_printf (out, "\tobject_signals[%s_SIGNAL] =\n"
 			    "\t\tg_signal_new (\"%s\",\n"
@@ -1299,18 +1316,15 @@ add_signals(Class *c)
 		if(strcmp(m->gtktypes->data, "NONE") != 0 ||
 		   ! is_none) {
 			GList *gl, *al;
-			char *sep = "";
-			out_printf(out, "\tif(");
+			out_printf(out, "\tif ___GOB_UNLIKELY(");
 			if(strcmp(m->gtktypes->data, "NONE") != 0) {
-				out_printf(out, "%s sizeof(", sep);
+				out_printf(out, "sizeof(");
 				print_type(out, m->mtype, FALSE);
 				out_printf(out, "%s",
 					   m->mtype->postfix ?
 					   m->mtype->postfix : ""); 
-				out_printf(out, ") != sizeof(%s)",
+				out_printf(out, ") != sizeof(%s) || ",
 					   get_cast(m->gtktypes->data, FALSE));
-
-				sep = " || ";
 			}
 
 			for(al = m->args->next, gl = m->gtktypes->next;
@@ -1319,16 +1333,18 @@ add_signals(Class *c)
 				FuncArg *arg = al->data;
 				char *gtkarg = gl->data;
 
-				out_printf(out, "%ssizeof(", sep);
+				out_printf(out, "sizeof(");
 				print_type(out, arg->atype, FALSE);
 				out_printf(out, "%s",
 					   arg->atype->postfix ?
 					   arg->atype->postfix : ""); 
-				out_printf(out, ") != sizeof(%s)",
+				out_printf(out, ") != sizeof(%s) || ",
 					   get_cast(gtkarg, FALSE));
-
-				sep = " || ";
 			}
+
+			out_printf (out,
+				    "parent_class == NULL /* avoid warning */");
+
 			out_printf(out, ") {\n"
 				   "\t\tg_error(\"%s line %d: Type mismatch "
 				   "of \\\"%s\\\" signal signature\");\n"
@@ -1369,13 +1385,13 @@ set_def_handlers(Class *c, const char *oname)
 		if (m->method == OVERRIDE_METHOD) {
 			char *s;
 			s = replace_sep (m->otype, '_');
-			g_strdown (s);
+			gob_strdown (s);
 
-			if (need_shutdown &&
-			    shutdown_handler != NULL &&
-			    strcmp (m->id, "shutdown") == 0)
-				out_printf (out, "\tg_object_class->shutdown "
-					    "= ___shutdown;\n");
+			if (need_dispose &&
+			    dispose_handler != NULL &&
+			    strcmp (m->id, "dispose") == 0)
+				out_printf (out, "\tg_object_class->dispose "
+					    "= ___dispose;\n");
 			else if (need_finalize &&
 				finalize_handler &&
 				strcmp(m->id, "finalize") == 0)
@@ -1455,7 +1471,7 @@ make_argument (Argument *a)
 	g_string_append (flags, ")");
 
 	s = g_strdup(a->name);
-	g_strup(s);
+	gob_strup (s);
 	if (!strcmp (a->gtktype, "ENUM"))
 		out_printf(out, "\tparam_spec = g_param_spec_enum (\"%s\", NULL, NULL,\n"
 			   "\t\tG_TYPE_ENUM, 0,\n"
@@ -1524,6 +1540,18 @@ make_argument (Argument *a)
 			   "\t\t0,\n"
 			   "\t\t%s);\n",
 			   a->name, flags->str);
+	else if (!strcmp (a->gtktype, "INT64"))
+		out_printf(out, "\tparam_spec = g_param_spec_int64 (\"%s\", NULL, NULL,\n"
+			   "\t\tG_MININT64, G_MAXINT64,\n"
+			   "\t\t0,\n"
+			   "\t\t%s);\n",
+			   a->name, flags->str);
+	else if (!strcmp (a->gtktype, "UINT64"))
+		out_printf(out, "\tparam_spec = g_param_spec_uint64 (\"%s\", NULL, NULL,\n"
+			   "\t\t0, G_MAXUINT64,\n"
+			   "\t\t0,\n"
+			   "\t\t%s);\n",
+			   a->name, flags->str);
 	else if (!strcmp (a->gtktype, "FLOAT"))
 		out_printf(out, "\tparam_spec = g_param_spec_float (\"%s\", NULL, NULL,\n"
 			   "\t\tG_MINFLOAT, G_MAXFLOAT,\n"
@@ -1555,353 +1583,400 @@ make_argument (Argument *a)
 
 #define value_for_print(str, alt) (str != NULL ? str : alt)
 
-static char *
-make_me_type (const char *type, const char *alt)
-{
-	if (type == NULL)
-		return g_strdup (alt);
-	/* HACK!  just in case someone made this
-	 * work with 2.0.0 by using the TYPE
-	 * macro directly */
-	if ((strstr (type, "_TYPE_") != NULL ||
-	     strstr (type, "TYPE_") == type) &&
-	    strchr (type, ':') == NULL)
-		return g_strdup (type);
-	return make_pre_macro (type, "TYPE");
-}
-
 static void
 make_property (Property *p)
 {
-	GString *flags;
-	GList *l;
 	char *s;
-	char *argflags[] = {
-		"CONSTRUCT",
-		"CONSTRUCT_ONLY",
-		"CHILD_ARG",
-		"MASK",
-		NULL
-	};
-
-	flags = g_string_new ("(GParamFlags)(");
-
-	if (p->get != NULL && p->set != NULL)
-		g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE");
-	else if (p->get != NULL)
-		g_string_append (flags, "G_PARAM_READABLE");
-	else
-		g_string_append (flags, "G_PARAM_WRITABLE");
 
 	if (p->get == NULL && p->set == NULL) {
 		error_print (GOB_ERROR, p->line_no,
 			     "Property has no getter nor setter");
 	}
 
-	for (l = p->flags; l != NULL; l = l->next) {
-		char *flag = l->data;
-		int i;
-		if(strcmp (flag, "READABLE") == 0 ||
-		   strcmp (flag, "WRITABLE") == 0) {
-			error_print(GOB_WARN, p->line_no,
-				    "READABLE and "
-				    "WRITABLE argument flags are "
-				    "set automatically");
-			continue;
-		}
-		for(i = 0; argflags[i]; i++) {
-			if(strcmp(argflags[i], flag)==0)
-				break;
+	if (p->override) {
+		if (p->flags != NULL)
+			error_print (GOB_WARN, p->line_no,
+				     "Overriden property, flags ignored");
+		if (p->nick != NULL)
+			error_print (GOB_WARN, p->line_no,
+				     "Overriden property, nick ignored");
+		if (p->blurb != NULL)
+			error_print (GOB_WARN, p->line_no,
+				     "Overriden property, blurb ignored");
+		if (p->minimum != NULL)
+			error_print (GOB_WARN, p->line_no,
+				     "Overriden property, minimum ignored");
+		if (p->maximum != NULL)
+			error_print (GOB_WARN, p->line_no,
+				     "Overriden property, maximum ignored");
+		if (p->default_value != NULL)
+			error_print (GOB_WARN, p->line_no,
+				     "Overriden property, default_value ignored");
+
+		s = g_strdup (p->name);
+		gob_strup (s);
+		out_printf (out, "\tg_object_class_override_property (g_object_class,\n"
+			    "\t\tPROP_%s,\n"
+			    "\t\t\"%s\");\n", s, p->name);
+		g_free (s);
+	} else {
+		GString *flags;
+		GList *l;
+		char *argflags[] = {
+			"CONSTRUCT",
+			"CONSTRUCT_ONLY",
+			"CHILD_ARG",
+			"MASK",
+			NULL
+		};
+
+		flags = g_string_new ("(GParamFlags)(");
+
+		if (p->get != NULL && p->set != NULL)
+			g_string_append (flags, "G_PARAM_READABLE | G_PARAM_WRITABLE");
+		else if (p->get != NULL)
+			g_string_append (flags, "G_PARAM_READABLE");
+		else
+			g_string_append (flags, "G_PARAM_WRITABLE");
+
+
+		for (l = p->flags; l != NULL; l = l->next) {
+			char *flag = l->data;
+			int i;
+			if(strcmp (flag, "READABLE") == 0 ||
+			   strcmp (flag, "WRITABLE") == 0) {
+				error_print(GOB_WARN, p->line_no,
+					    "READABLE and "
+					    "WRITABLE argument flags are "
+					    "set automatically");
+				continue;
+			}
+			for(i = 0; argflags[i]; i++) {
+				if(strcmp(argflags[i], flag)==0)
+					break;
+			}
+			/* if we haven't found it in our list */
+			if( ! argflags[i]) {
+				error_printf(GOB_WARN, p->line_no,
+					     "Unknown flag '%s' used, "
+					     "perhaps it was misspelled", flag);
+			}
+			g_string_sprintfa(flags, " | G_PARAM_%s", flag);
 		}
-		/* if we haven't found it in our list */
-		if( ! argflags[i]) {
-			error_printf(GOB_WARN, p->line_no,
-				     "Unknown flag '%s' used, "
-				     "perhaps it was misspelled", flag);
+
+		g_string_append (flags, ")");
+
+		if (strcmp (p->gtktype, "CHAR") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_char\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "-128"),
+				    value_for_print (p->maximum, "127"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "UCHAR") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_uchar\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "0"),
+				    value_for_print (p->maximum, "0xFF"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "BOOLEAN") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_boolean\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->default_value, "FALSE"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "INT") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_int\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "G_MININT"),
+				    value_for_print (p->maximum, "G_MAXINT"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "UINT") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_uint\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "0"),
+				    value_for_print (p->maximum, "G_MAXUINT"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "LONG") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_long\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "G_MINLONG"),
+				    value_for_print (p->maximum, "G_MAXLONG"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "ULONG") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_ulong\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "0"),
+				    value_for_print (p->maximum, "G_MAXULONG"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "INT64") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_int64\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "G_MININT64"),
+				    value_for_print (p->maximum, "G_MAXINT64"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "UINT64") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_uint64\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "0"),
+				    value_for_print (p->maximum, "G_MAXUINT64"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "UNICHAR") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_unichar\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "ENUM") == 0) {
+			char *type = make_me_type (p->extra_gtktype,
+						   "G_TYPE_ENUM");
+			out_printf (out, "\tparam_spec = g_param_spec_enum\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* enum_type */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    type,
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+			g_free (type);
+		} else if (strcmp (p->gtktype, "FLAGS") == 0) {
+			char *type = make_me_type (p->extra_gtktype,
+						   "G_TYPE_FLAGS");
+			out_printf (out, "\tparam_spec = g_param_spec_flags\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* flags_type */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    type,
+				    value_for_print (p->default_value, "0"),
+				    flags->str);
+			g_free (type);
+		} else if (strcmp (p->gtktype, "FLOAT") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_float\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "G_MINFLOAT"),
+				    value_for_print (p->maximum, "G_MAXFLOAT"),
+				    value_for_print (p->default_value, "0.0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "DOUBLE") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_double\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* minimum */,\n"
+				    "\t\t %s /* maximum */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->minimum, "G_MINDOUBLE"),
+				    value_for_print (p->maximum, "G_MAXDOUBLE"),
+				    value_for_print (p->default_value, "0.0"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "STRING") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_string\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* default_value */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    value_for_print (p->default_value, "NULL"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "PARAM") == 0) {
+			char *type = make_me_type (p->extra_gtktype,
+						   "G_TYPE_PARAM");
+			out_printf (out, "\tparam_spec = g_param_spec_param\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* param_type */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    type,
+				    flags->str);
+			g_free (type);
+		} else if (strcmp (p->gtktype, "BOXED") == 0) {
+			char *type = make_me_type (p->extra_gtktype,
+						   "G_TYPE_BOXED");
+			out_printf (out, "\tparam_spec = g_param_spec_boxed\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* boxed_type */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    type,
+				    flags->str);
+			g_free (type);
+		} else if (strcmp (p->gtktype, "POINTER") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    flags->str);
+		/* FIXME: VALUE_ARRAY */
+		} else if (strcmp (p->gtktype, "CLOSURE") == 0) {
+			out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    flags->str);
+		} else if (strcmp (p->gtktype, "OBJECT") == 0) {
+			char *type = make_me_type (p->extra_gtktype,
+						   "G_TYPE_BOXED");
+			out_printf (out, "\tparam_spec = g_param_spec_object\n"
+				    "\t\t(\"%s\" /* name */,\n"
+				    "\t\t %s /* nick */,\n"
+				    "\t\t %s /* blurb */,\n"
+				    "\t\t %s /* object_type */,\n"
+				    "\t\t %s);\n",
+				    p->name,
+				    value_for_print (p->nick, "NULL"),
+				    value_for_print (p->blurb, "NULL"),
+				    type,
+				    flags->str);
+			g_free (type);
+		} else {
+			error_printf (GOB_ERROR, p->line_no,
+				      "%s type is not supported by properties",
+				      p->gtktype);
 		}
-		g_string_sprintfa(flags, " | G_PARAM_%s", flag);
-	}
 
-	g_string_append (flags, ")");
+		s = g_strdup (p->name);
+		gob_strup (s);
+		out_printf (out, "\tg_object_class_install_property (g_object_class,\n"
+			    "\t\tPROP_%s,\n"
+			    "\t\tparam_spec);\n", s);
+		g_free (s);
 
-	if (strcmp (p->gtktype, "CHAR") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_char\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* minimum */,\n"
-			    "\t\t %s /* maximum */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->minimum, "-128"),
-			    value_for_print (p->maximum, "127"),
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "UCHAR") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_uchar\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* minimum */,\n"
-			    "\t\t %s /* maximum */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->minimum, "0"),
-			    value_for_print (p->maximum, "0xFF"),
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "BOOLEAN") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_boolean\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->default_value, "FALSE"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "INT") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_int\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* minimum */,\n"
-			    "\t\t %s /* maximum */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->minimum, "G_MININT"),
-			    value_for_print (p->maximum, "G_MAXINT"),
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "UINT") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_uint\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* minimum */,\n"
-			    "\t\t %s /* maximum */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->minimum, "0"),
-			    value_for_print (p->maximum, "G_MAXUINT"),
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "LONG") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_long\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* minimum */,\n"
-			    "\t\t %s /* maximum */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->minimum, "G_MINLONG"),
-			    value_for_print (p->maximum, "G_MAXLONG"),
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "ULONG") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_ulong\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* minimum */,\n"
-			    "\t\t %s /* maximum */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->minimum, "0"),
-			    value_for_print (p->maximum, "G_MAXULONG"),
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "UNICHAR") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_unichar\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "ENUM") == 0) {
-		char *type = make_me_type (p->extra_gtktype,
-					   "G_TYPE_ENUM");
-		out_printf (out, "\tparam_spec = g_param_spec_enum\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* enum_type */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    type,
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-		g_free (type);
-	} else if (strcmp (p->gtktype, "FLAGS") == 0) {
-		char *type = make_me_type (p->extra_gtktype,
-					   "G_TYPE_FLAGS");
-		out_printf (out, "\tparam_spec = g_param_spec_flags\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* flags_type */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    type,
-			    value_for_print (p->default_value, "0"),
-			    flags->str);
-		g_free (type);
-	} else if (strcmp (p->gtktype, "FLOAT") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_float\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* minimum */,\n"
-			    "\t\t %s /* maximum */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->minimum, "G_MINFLOAT"),
-			    value_for_print (p->maximum, "G_MAXFLOAT"),
-			    value_for_print (p->default_value, "0.0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "DOUBLE") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_double\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* minimum */,\n"
-			    "\t\t %s /* maximum */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->minimum, "G_MINDOUBLE"),
-			    value_for_print (p->maximum, "G_MAXDOUBLE"),
-			    value_for_print (p->default_value, "0.0"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "STRING") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_string\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* default_value */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    value_for_print (p->default_value, "NULL"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "PARAM") == 0) {
-		char *type = make_me_type (p->extra_gtktype,
-					   "G_TYPE_PARAM");
-		out_printf (out, "\tparam_spec = g_param_spec_param\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* param_type */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    type,
-			    flags->str);
-		g_free (type);
-	} else if (strcmp (p->gtktype, "BOXED") == 0) {
-		char *type = make_me_type (p->extra_gtktype,
-					   "G_TYPE_BOXED");
-		out_printf (out, "\tparam_spec = g_param_spec_boxed\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* boxed_type */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    type,
-			    flags->str);
-		g_free (type);
-	} else if (strcmp (p->gtktype, "POINTER") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    flags->str);
-	/* FIXME: VALUE_ARRAY */
-	} else if (strcmp (p->gtktype, "CLOSURE") == 0) {
-		out_printf (out, "\tparam_spec = g_param_spec_pointer\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    flags->str);
-	} else if (strcmp (p->gtktype, "OBJECT") == 0) {
-		char *type = make_me_type (p->extra_gtktype,
-					   "G_TYPE_BOXED");
-		out_printf (out, "\tparam_spec = g_param_spec_object\n"
-			    "\t\t(\"%s\" /* name */,\n"
-			    "\t\t %s /* nick */,\n"
-			    "\t\t %s /* blurb */,\n"
-			    "\t\t %s /* object_type */,\n"
-			    "\t\t %s);\n",
-			    p->name,
-			    value_for_print (p->nick, "NULL"),
-			    value_for_print (p->blurb, "NULL"),
-			    type,
-			    flags->str);
-		g_free (type);
-	} else {
-		error_printf (GOB_ERROR, p->line_no,
-			      "%s type is not supported by properties",
-			      p->gtktype);
+		g_string_free (flags, TRUE);
 	}
-
-	s = g_strdup (p->name);
-	g_strup (s);
-	out_printf (out, "\tg_object_class_install_property (g_object_class,\n"
-		    "\t\tPROP_%s,\n"
-		    "\t\tparam_spec);\n", s);
-	g_free (s);
-
-	g_string_free (flags, TRUE);
 }
 
 static void
@@ -1912,8 +1987,15 @@ make_arguments(Class *c)
 		out_printf(out, "\tg_object_class->get_property = ___object_get_property;\n");
 	if (set_properties > 0)
 		out_printf(out, "\tg_object_class->set_property = ___object_set_property;\n");
-	out_printf (out, "    {\n"
-		    "\tGParamSpec   *param_spec;\n\n");
+	out_printf (out, "    {\n");
+	for (li = c->nodes; li != NULL; li = li->next) {
+		Node *n = li->data;
+		if ((n->type == PROPERTY_NODE && ! ((Property *) n)->override)
+		    || n->type == ARGUMENT_NODE) {
+			out_printf(out, "\tGParamSpec   *param_spec;\n\n");
+			break;
+		}
+	}
 
 	for (li = c->nodes; li != NULL; li = li->next) {
 		Node *n = li->data;
@@ -1954,7 +2036,7 @@ print_initializer(Method *m, Variable *v)
 static void
 print_destructor (Variable *v)
 {
-	char *root;
+	const char *root;
 
 	if(v->destructor == NULL)
 		return;
@@ -1968,11 +2050,19 @@ print_destructor (Variable *v)
 		if(v->destructor_line > 0)
 			out_addline_infile(out, v->destructor_line);
 
-		out_printf(out, "\tif(%s->%s) { "
-			   "((*(void (*)(void *))%s)) (%s->%s); "
-			   "%s->%s = NULL; }\n",
-			   root, v->id, v->destructor, root, v->id,
-			   root, v->id);
+		if (for_cpp) {
+			out_printf(out, "\tif(%s->%s) { "
+				   "(reinterpret_cast<void (*)(void *)>(%s)) ((gpointer)%s->%s); "
+				   "%s->%s = NULL; }\n",
+				   root, v->id, v->destructor, root, v->id,
+				   root, v->id);
+		} else {
+			out_printf(out, "\tif(%s->%s) { "
+				   "%s ((gpointer) %s->%s); "
+				   "%s->%s = NULL; }\n",
+				   root, v->id, v->destructor, root, v->id,
+				   root, v->id);
+		}
 
 		if(v->destructor_line > 0)
 			out_addline_outfile(out);
@@ -1995,32 +2085,34 @@ print_destructor (Variable *v)
 }
 
 static void
-add_shutdown (Class *c)
+add_dispose (Class *c)
 {
 	out_printf(out, "\nstatic void\n"
-		   "___shutdown (GObject *obj_self)\n"
+		   "___dispose (GObject *obj_self)\n"
 		   "{\n");
 	out_printf(out,
-		   "#define __GOB_FUNCTION__ \"%s::shutdown\"\n",
+		   "#define __GOB_FUNCTION__ \"%s::dispose\"\n",
 		   c->otype);
 
 	if (unreftors > 0) {
-		out_printf (out, "\t%s *self = %s (obj_self);\n",
-			    typebase, macrobase);
+		out_printf (out, "\t%s *self%s = %s (obj_self);\n",
+			    typebase,
+			    ! no_gnu ? " G_GNUC_UNUSED" : "",
+			    macrobase);
 	}
 
-	if (shutdown_handler != NULL) {
+	if (dispose_handler != NULL) {
 		/* so we get possible bad argument warning */
-		if (shutdown_handler->line_no > 0)
-			out_addline_infile (out, shutdown_handler->line_no);
-		out_printf (out, "\t___%x_%s_shutdown(obj_self);\n",
-			    (guint)shutdown_handler->unique_id, funcbase);
-		if (shutdown_handler->line_no > 0)
+		if (dispose_handler->line_no > 0)
+			out_addline_infile (out, dispose_handler->line_no);
+		out_printf (out, "\t___%x_%s_dispose(obj_self);\n",
+			    (guint)dispose_handler->unique_id, funcbase);
+		if (dispose_handler->line_no > 0)
 			out_addline_outfile (out);
 	} else {
 		out_printf (out,
-			    "\tif (G_OBJECT_CLASS (parent_class)->shutdown) \\\n"
-			    "\t\t(* G_OBJECT_CLASS (parent_class)->shutdown) (obj_self);\n");
+			    "\tif (G_OBJECT_CLASS (parent_class)->dispose) \\\n"
+			    "\t\t(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);\n");
 	}
 
 	if (unreftors > 0) {
@@ -2037,9 +2129,6 @@ add_shutdown (Class *c)
 		}
 	}
 
-	out_printf (out, "\treturn;\n");
-	if (unreftors > 0)
-		out_printf(out, "\tself = NULL;\n");
 	out_printf(out, "}\n"
 		   "#undef __GOB_FUNCTION__\n\n");
 }
@@ -2057,11 +2146,18 @@ add_finalize (Class *c)
 
 	if (privates > 0 ||
 	    destructors > 0) {
-		out_printf(out, "\t%s *self = %s (obj_self);\n",
-			   typebase, macrobase);
+		const char *unused = "";
+		if ( ! no_gnu)
+			unused = " G_GNUC_UNUSED";
+		out_printf(out, "\t%s *self%s = %s (obj_self);\n",
+			   typebase, unused, macrobase);
 	}
 	if (privates > 0) {
-		out_printf(out, "\tgpointer priv = self->_priv;\n");
+		const char *unused = "";
+		if ( ! no_gnu)
+			unused = " G_GNUC_UNUSED";
+		out_printf(out, "\tgpointer priv%s = self->_priv;\n",
+			   unused);
 	}
 
 	if(finalize_handler) {
@@ -2092,14 +2188,6 @@ add_finalize (Class *c)
 		}
 	}
 
-	if (privates > 0) {
-		out_printf(out, "\tg_free (priv);\n");
-	}
-	out_printf (out, "\treturn;\n");
-	if (destructors > 0 ||
-	    privates > 0)
-		out_printf (out, "\tself = NULL;\n");
-
 	out_printf(out, "}\n"
 		   "#undef __GOB_FUNCTION__\n\n");
 }
@@ -2137,13 +2225,16 @@ make_bonobo_object_epv (Class *c, const char *classname)
 static void
 add_inits(Class *c)
 {
+	const char *unused = "";
 	GList *li;
+
+	if ( ! no_gnu)
+		unused = " G_GNUC_UNUSED";
+
 	for(li=c->nodes;li;li=g_list_next(li)) {
 		Node *n = li->data;
 		Method *m;
 
-		gboolean add_unused_class = FALSE;
-
 		if(n->type != METHOD_NODE)
 			continue;
 		m = (Method *)n;
@@ -2151,17 +2242,18 @@ add_inits(Class *c)
 			if(m->line_no > 0)
 				out_addline_infile(out, m->line_no);
 			print_method(out, "static ", "\n", "", " ", "", "\n",
-				     m, FALSE, FALSE, TRUE);
+				     m, FALSE, FALSE, TRUE, TRUE, FALSE);
 			if(m->line_no > 0)
 				out_addline_outfile(out);
 			out_printf(out, "{\n"
 				   "#define __GOB_FUNCTION__ \"%s::init\"\n",
 				   c->otype);
-			if(privates > 0) {
+			if (privates > 0) {
 				out_printf(out, "\t%s->_priv = "
-					   "g_new0 (%sPrivate, 1);\n",
-					   ((FuncArg *)m->args->data)->name,
-					   typebase);
+						"G_TYPE_INSTANCE_GET_PRIVATE(%s,TYPE_SELF,%sPrivate);\n",
+						((FuncArg *)m->args->data)->name,
+						((FuncArg *)m->args->data)->name,
+						typebase);
 			} else if(always_private_struct) {
 				out_printf(out, "\t%s->_priv = NULL;\n",
 					   ((FuncArg *)m->args->data)->name);
@@ -2185,7 +2277,7 @@ add_inits(Class *c)
 			if(m->line_no > 0)
 				out_addline_infile(out, m->line_no);
 			print_method(out, "static ", "\n", "", " ", "", "\n",
-				     m, FALSE, FALSE, TRUE);
+				     m, FALSE, FALSE, TRUE, TRUE, FALSE);
 			if(m->line_no > 0)
 				out_addline_outfile(out);
 			out_printf(out, "{\n"
@@ -2194,14 +2286,14 @@ add_inits(Class *c)
 			if (set_properties > 0 ||
 			    get_properties > 0 ||
 			    signals > 0 ||
-			    need_shutdown ||
+			    need_dispose ||
 			    need_finalize) {
 				out_printf(out,
 					   "\tGObjectClass *"
-					   "g_object_class = "
+					   "g_object_class%s = "
 					   "(GObjectClass*) %s;\n",
+					   unused,
 					   ((FuncArg *)m->args->data)->name);
-				add_unused_class = TRUE;
 				did_base_obj = TRUE;
 			}
 
@@ -2210,6 +2302,12 @@ add_inits(Class *c)
 					       ((FuncArg *)m->args->data)->name,
 					       did_base_obj);
 
+			if (privates > 0)
+				out_printf (out,
+					    "\n\tg_type_class_add_private(%s,sizeof(%sPrivate));\n",
+					    ((FuncArg *)m->args->data)->name,
+					    typebase);
+
 			if (initializers > 0) {
 				GList *li;
 				for(li = ((Class *)class)->nodes;
@@ -2236,9 +2334,9 @@ add_inits(Class *c)
 
 			/* if there are no handlers for these things, we
 			 * need to set them up here */
-			if(need_shutdown && !shutdown_handler)
-				out_printf(out, "\tg_object_class->shutdown "
-					   "= ___shutdown;\n");
+			if(need_dispose && !dispose_handler)
+				out_printf(out, "\tg_object_class->dispose "
+					   "= ___dispose;\n");
 			if(need_finalize && !finalize_handler)
 				out_printf(out, "\tg_object_class->finalize = "
 					   "___finalize;\n");
@@ -2259,13 +2357,6 @@ add_inits(Class *c)
 			out_addline_outfile(out);
 			out_printf(out, " }\n");
 		}
-		out_printf(out, "\treturn;\n");
-		out_printf(out,
-			   "\t%s = NULL;\n",
-			   ((FuncArg *)m->args->data)->name);
-		if(add_unused_class) {
-			out_printf (out, "\tg_object_class = NULL;\n");
-		}
 		out_printf(out, "}\n"
 			   "#undef __GOB_FUNCTION__\n");
 	}
@@ -2289,22 +2380,39 @@ add_argument (Argument *a, gboolean is_set)
 	if (cbuf == NULL)
 		return;
 	s = g_strdup(a->name);
-	g_strup(s);
+	gob_strup (s);
 	out_printf(out, "\tcase PROP_%s:\n\t{", s);
 
 	the_type_lower = g_strdup (a->gtktype);
-	g_strdown (the_type_lower);
+	gob_strdown (the_type_lower);
+
+	/* HACK because there is no g_value_set/get for unichar */
+	if (strcmp (the_type_lower, "unichar") == 0) {
+		g_free (the_type_lower);
+		the_type_lower = g_strdup ("uint");
+	}
 
 	if (is_set) {
 		char *cast;
+		const char *unused = "";
 
-		if (a->atype != NULL)
+		if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) {
+			unused = " G_GNUC_UNUSED";
+		}
+
+		if (a->atype != NULL &&
+		    /* gcc -Wbad-function-cast is wanking stupid, moronic
+		       and otherwise evil so we should just use a (gint)
+		       or (guint) cast, not the specific type cast */
+		    (for_cpp ||
+		     (strcmp (a->gtktype, "ENUM") != 0 &&
+		     strcmp (a->gtktype, "FLAGS") != 0)))
 			cast = get_type (a->atype, TRUE);
 		else
 			cast = g_strdup (get_cast (a->gtktype, FALSE));
 
-		out_printf (out, "\t%s ARG = (%s) g_value_get_%s (VAL);\n",
-			    cast, cast, the_type_lower);
+		out_printf (out, "\t%s ARG%s = (%s) g_value_get_%s (VAL);\n",
+			    cast, unused, cast, the_type_lower);
 
 		g_free (cast);
 	} else if ( ! is_set) {
@@ -2339,8 +2447,9 @@ add_argument (Argument *a, gboolean is_set)
 	}
 	g_free (the_type_lower);
 
-	if (is_set) {
-		out_printf (out, "\t\tif (&ARG) ;\n");
+	if (is_set &&
+	    (no_gnu || for_cpp /* g++ has a cow with G_GNUC_UNUSED */)) {
+		out_printf (out, "\t\tif (&ARG) break;\n");
 	}
 
 	out_printf (out, "\t\tbreak;\n");
@@ -2367,9 +2476,9 @@ add_property (Property *p, gboolean is_set)
 		return;
 
 	name_upper = g_strdup (p->name);
-	g_strup (name_upper);
+	gob_strup (name_upper);
 	the_type_lower = g_strdup (p->gtktype);
-	g_strdown (the_type_lower);
+	gob_strdown (the_type_lower);
 
 	out_printf (out, "\tcase PROP_%s:\n", name_upper);
 
@@ -2391,20 +2500,34 @@ static void
 add_getset_arg(Class *c, gboolean is_set)
 {
 	GList *li;
+	const char *unused = "";
+	const char *hack_unused = "";
+
+	if ( ! no_gnu && ! for_cpp /* g++ has a cow with this */) {
+		unused = " G_GNUC_UNUSED";
+	} else {
+		hack_unused = "if (&VAL || &pspec) break;\n\t\t";
+	}
+
 	out_printf(out, "\nstatic void\n"
 		   "___object_%s_property (GObject *object,\n"
 		   "\tguint property_id,\n"
-		   "\t%sGValue *VAL,\n"
-		   "\tGParamSpec *pspec)\n"
+		   "\t%sGValue *VAL%s,\n"
+		   "\tGParamSpec *pspec%s)\n"
 		   "#define __GOB_FUNCTION__ \"%s::%s_property\"\n"
 		   "{\n"
-		   "\t%s *self;\n\n"
+		   "\t%s *self%s;\n\n"
 		   "\tself = %s (object);\n\n"
 		   "\tswitch (property_id) {\n",
 		   is_set ? "set" : "get",
 		   is_set ? "const " : "",
-		   c->otype, is_set ? "set" : "get",
-		   typebase, macrobase);
+		   unused,
+		   unused,
+		   c->otype,
+		   is_set ? "set" : "get",
+		   typebase,
+		   unused,
+		   macrobase);
 
 	for (li = c->nodes; li != NULL; li = li->next) {
 		Node *n = li->data;
@@ -2420,9 +2543,9 @@ add_getset_arg(Class *c, gboolean is_set)
 		    "#  define G_STRLOC	__FILE__ \":\" G_STRINGIFY (__LINE__)\n"
 		    "#endif\n"
 		    "\t\tG_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);\n"
-		    "\t\tbreak;\n\t}\n"
-		    "\treturn;\n\tself = NULL;\n\tVAL = NULL;\n\tpspec = NULL;\n}\n"
-		    "#undef __GOB_FUNCTION__\n");
+		    "\t\t%sbreak;\n\t}\n"
+		    "}\n"
+		    "#undef __GOB_FUNCTION__\n", hack_unused);
 }
 
 static void
@@ -2504,7 +2627,7 @@ print_preconditions(Method *m)
 }
 
 static void
-print_method_body(Method *m, int pre)
+print_method_body (Method *m, gboolean pre, gboolean unused_self)
 {
 	if (m->line_no > 0)
 		out_addline_outfile(out);
@@ -2512,9 +2635,18 @@ print_method_body(Method *m, int pre)
 		   "#define __GOB_FUNCTION__ \"%s::%s\"\n",
 		   ((Class *)class)->otype,
 		   m->id);
-	if(pre)
+	if (pre)
 		print_preconditions(m);
 
+	if ( ! pre &&
+	     unused_self &&
+	    (no_gnu || for_cpp) &&
+	    m->args != NULL &&
+	    ((FuncArg *)(m->args->data))->name != NULL &&
+	    strcmp (((FuncArg *)(m->args->data))->name, "self") == 0) {
+		out_printf (out, "\tif (&self) { ; }\n");
+	}
+
 	/* Note: the trailing }'s are on one line, this is so
 	   that we get the no return warning correctly and point to
 	   the correct line in the .gob file, yes this is slightly
@@ -2570,10 +2702,14 @@ put_signal_args (Method *m)
 			    "\tg_value_init (&___param_values[%d], G_TYPE_%s);\n",
 			    i, i, (char *)ali->data);
 
-		set_func = g_strdup_printf ("g_value_set%s_%s",
-					    do_static ? "_static" : "",
-					    (char *)ali->data);
-		g_strdown (set_func);
+		if (strcmp (ali->data, "UNICHAR") == 0)
+			/* hack because glib is braindamaged */
+			set_func = g_strdup ("g_value_set_uint");
+		else
+			set_func = g_strdup_printf ("g_value_set%s_%s",
+						    do_static ? "_static" : "",
+						    (char *)ali->data);
+		gob_strdown (set_func);
 
 		out_printf (out, "\t%s (&___param_values[%d], (%s) %s);\n\n",
 			    set_func, i, cast, fa->name);
@@ -2583,21 +2719,38 @@ put_signal_args (Method *m)
 	}
 }
 
+static void
+clear_signal_args (Method *m)
+{
+	GList *li;
+	int i;
+
+	out_printf (out, "\n\tg_value_unset (&___param_values[0]);\n");
+
+	if (m->args->next == NULL)
+		return;
+
+	for (li = m->args->next, i = 1;
+	     li != NULL;
+	     li = li->next, i++) {
+		out_printf (out,
+			    "\tg_value_unset (&___param_values[%d]);\n", i);
+	}
+}
+
 static char *
-get_arg_names_for_macro(Method *m)
+get_arg_names_for_macro (Method *m)
 {
-	char *p;
+	const char *sep;
 	GList *li;
 	GString *gs = g_string_new(NULL);
-	p = "";
+	sep = "";
 	for(li=m->args;li;li=g_list_next(li)) {
 		FuncArg *arg = li->data;
-		g_string_sprintfa(gs, "%s___%s", p, arg->name);
-		p = ",";
+		g_string_sprintfa (gs, "%s___%s", sep, arg->name);
+		sep = ",";
 	}
-	p = gs->str;
-	g_string_free(gs, FALSE);
-	return p;
+	return g_string_free (gs, FALSE);
 }
 
 static void
@@ -2621,11 +2774,11 @@ put_method(Method *m)
 			out_addline_infile(out, m->line_no);
 		if(m->scope == PRIVATE_SCOPE)
 			print_method(out, "static ", "\n", "", " ", "", "\n",
-				     m, FALSE, FALSE, TRUE);
+				     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 		else /* PUBLIC, PROTECTED */
 			print_method(out, "", "\n", "", " ", "", "\n",
-				     m, FALSE, FALSE, TRUE);
-		print_method_body(m, TRUE);
+				     m, FALSE, FALSE, TRUE, FALSE, FALSE);
+		print_method_body(m, TRUE, TRUE);
 		/* the outfile line was added above */
 		break;
 	case SIGNAL_FIRST_METHOD:
@@ -2634,17 +2787,21 @@ put_method(Method *m)
 			out_addline_infile(out, m->line_no);
 		if(m->scope == PRIVATE_SCOPE)
 			print_method(out, "static ", "\n", "", " ", "", "\n",
-				     m, FALSE, FALSE, TRUE);
+				     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 		else /* PUBLIC, PROTECTED */
 			print_method(out, "", "\n", "", " ", "", "\n",
-				     m, FALSE, FALSE, TRUE);
+				     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 		out_addline_outfile (out);
 
 		out_printf (out, "{\n");
 
 		out_printf (out,
 			    "\tGValue ___param_values[%d];\n"
-			    "\tGValue ___return_val = {0};\n\n",
+			    "\tGValue ___return_val;\n\n"
+			    "memset (&___return_val, 0, "
+			      "sizeof (___return_val));\n"
+			    "memset (&___param_values, 0, "
+			      "sizeof (___param_values));\n\n",
 			    g_list_length (m->args));
 
 		print_preconditions (m);
@@ -2679,10 +2836,14 @@ put_method(Method *m)
 				if (cast == NULL)
 					cast = get_type (m->mtype, TRUE);
 
-				set_func = g_strdup_printf ("g_value_set%s_%s",
-							    do_static ? "_static" : "",
-							    (char *)m->gtktypes->data);
-				g_strdown (set_func);
+				if (strcmp (m->gtktypes->data, "UNICHAR") == 0)
+					/* hack because glib is braindamaged */
+					set_func = g_strdup ("g_value_set_uint");
+				else
+					set_func = g_strdup_printf ("g_value_set%s_%s",
+								    do_static ? "_static" : "",
+								    (char *)m->gtktypes->data);
+				gob_strdown (set_func);
 
 				out_printf (out, "\t%s (&___return_val, (%s) (%s));\n",
 					    set_func, cast, defret);
@@ -2694,7 +2855,7 @@ put_method(Method *m)
 		}
 
 		s = g_strdup (m->id);
-		g_strup (s);
+		gob_strup (s);
 
 		out_printf(out, "\tg_signal_emitv (___param_values,\n"
 			   "\t\tobject_signals[%s_SIGNAL],\n"
@@ -2703,16 +2864,39 @@ put_method(Method *m)
 
 		g_free (s);
 
+		clear_signal_args (m);
+
 		if (strcmp (m->gtktypes->data, "NONE") != 0) {
 			char *cast = g_strdup (get_cast (m->gtktypes->data, FALSE));
-			char *getfunc = g_strdup_printf ("g_value_get_%s",
-							 (char *)m->gtktypes->data);
-			g_strdown (getfunc);
+			char *getfunc;
+			/* Hack because glib is very very braindead */
+			gboolean do_dup = 
+				(strcmp ((char *)m->gtktypes->data, "STRING") == 0 ||
+				 strcmp ((char *)m->gtktypes->data, "BOXED") == 0 ||
+				 strcmp ((char *)m->gtktypes->data, "OBJECT") == 0 ||
+				 strcmp ((char *)m->gtktypes->data, "PARAM") == 0);
+
+			if (strcmp (m->gtktypes->data, "UNICHAR") == 0)
+				/* hack because glib is braindamaged */
+				getfunc = g_strdup ("g_value_get_uint");
+			else
+				getfunc = g_strdup_printf ("g_value_%s_%s",
+							   do_dup ? "dup" : "get",
+							   (char *)m->gtktypes->data);
+			gob_strdown (getfunc);
 
 			if (cast == NULL)
 				cast = get_type (m->mtype, TRUE);
 
-			out_printf (out, "\n\treturn (%s) %s (&___return_val);\n",
+			out_printf (out,
+				    "\n\t{\n"
+				    "\t\t");
+			print_type (out, m->mtype, TRUE);
+			out_printf (out,
+				    " ___ret = (%s) %s (&___return_val);\n"
+				    "\t\tg_value_unset (&___return_val);\n"
+				    "\t\treturn ___ret;\n"
+				    "\t}\n",
 				    cast, getfunc);
 
 			g_free (cast);
@@ -2725,8 +2909,8 @@ put_method(Method *m)
 		if(m->line_no > 0)
 			out_addline_infile(out, m->line_no);
 		print_method(out, "static ", "\n___real_", "", " ", "", "\n",
-			     m, FALSE, FALSE, TRUE);
-		print_method_body(m, FALSE);
+			     m, FALSE, FALSE, TRUE, TRUE, FALSE);
+		print_method_body(m, FALSE, TRUE);
 		/* the outfile line was added above */
 		break;
 	case VIRTUAL_METHOD:
@@ -2734,10 +2918,10 @@ put_method(Method *m)
 			out_addline_infile(out, m->line_no);
 		if(m->scope==PRIVATE_SCOPE)
 			print_method(out, "static ", "\n", "", " ", "", "\n",
-				     m, FALSE, FALSE, TRUE);
+				     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 		else /* PUBLIC, PROTECTED */
 			print_method(out, "", "\n", "", " ", "", "\n",
-				     m, FALSE, FALSE, TRUE);
+				     m, FALSE, FALSE, TRUE, FALSE, FALSE);
 		out_addline_outfile(out);
 		out_printf(out, "{\n"
 			"\t%sClass *klass;\n", typebase);
@@ -2783,8 +2967,8 @@ put_method(Method *m)
 		if(m->line_no > 0)
 			out_addline_infile(out, m->line_no);
 		print_method(out, "static ", "\n___real_", "", " ", "", "\n",
-			     m, FALSE, FALSE, TRUE);
-		print_method_body(m, FALSE);
+			     m, FALSE, FALSE, TRUE, TRUE, FALSE);
+		print_method_body(m, FALSE, TRUE);
 		/* the outfile line was added above */
 		break;
 	case OVERRIDE_METHOD:
@@ -2794,11 +2978,11 @@ put_method(Method *m)
 			out_addline_infile(out, m->line_no);
 		s = g_strdup_printf("\n___%x_", (guint)m->unique_id);
 		print_method(out, "static ", s, "", " ", "", "\n",
-			     m, FALSE, FALSE, FALSE);
+			     m, FALSE, FALSE, FALSE, TRUE, FALSE);
 		g_free(s);
 		out_addline_outfile(out);
 		s = replace_sep(m->otype, '_');
-		g_strup(s);
+		gob_strup (s);
 		args = get_arg_names_for_macro(m);
 		if(is_void) {
 			out_printf(out, "#define PARENT_HANDLER(%s) \\\n"
@@ -2818,7 +3002,7 @@ put_method(Method *m)
 		}
 		g_free(args);
 		g_free(s);
-		print_method_body(m, TRUE);
+		print_method_body(m, TRUE, TRUE);
 		/* the outfile line was added above */
 		out_printf(out, "#undef PARENT_HANDLER\n");
 		break;
@@ -2833,26 +3017,30 @@ open_files(void)
 	char *outfile, *outfileh, *outfileph;
 
 	if ( ! for_cpp)
-		outfile = g_strconcat (filebase, ".c", NULL);
+		outfile = g_strconcat (fullfilebase, ".c", NULL);
 	else
-		outfile = g_strconcat (filebase, ".cc", NULL);
+		outfile = g_strconcat (fullfilebase, ".cc", NULL);
 	if (no_touch_headers)
-		outfileh = g_strconcat ("#gob#", filebase, ".h#gob#", NULL);
+		outfileh = g_strconcat (fullfilebase, ".h#gob#", NULL);
 	else
-		outfileh = g_strconcat (filebase, ".h", NULL);
+		outfileh = g_strconcat (fullfilebase, ".h", NULL);
 
 	if ((privates > 0 || protecteds > 0 ||
 	     private_header == PRIVATE_HEADER_ALWAYS) &&
-	    private_header != PRIVATE_HEADER_NEVER)
-		outfileph = g_strconcat (filebase, "-private.h", NULL);
-	else
+	    private_header != PRIVATE_HEADER_NEVER) {
+		char sep[2] = {0,0};
+		if (file_sep != 0)
+			sep[0] = file_sep;
+		outfileph = g_strconcat (fullfilebase, sep, "private.h", NULL);
+	} else {
 		outfileph = NULL;
+	}
 
 	
 	if (no_write) {
 		devnull = fopen ("/dev/null", "w");
 		if (devnull == NULL)
-			g_error ("Cannot open null device");
+			error_print (GOB_ERROR, 0, "Cannot open null device");
 		out = devnull;
 		outh = devnull;
 		if (outfileph != NULL)
@@ -2860,15 +3048,21 @@ open_files(void)
 	} else {
 		out = fopen (outfile, "w");
 		if (out == NULL) {
-			g_error ("Cannot open outfile: %s", outfile);
+			error_printf (GOB_ERROR, 0,
+				      "Cannot open outfile: %s", outfile);
 		}
 		outh = fopen (outfileh, "w");
-		if (outh == NULL)
-			g_error ("Cannot open outfile: %s", outfileh);
+		if (outh == NULL) {
+			error_printf (GOB_ERROR, 0,
+				      "Cannot open outfile: %s", outfileh);
+		}
 		if (outfileph != NULL) {
 			outph = fopen (outfileph, "w");
-			if (outph == NULL)
-				g_error ("Cannot open outfile: %s", outfileh);
+			if (outph == NULL) {
+				error_printf (GOB_ERROR, 0,
+					      "Cannot open outfile: %s",
+					      outfileph);
+			}
 		}
 	}
 }
@@ -2908,7 +3102,7 @@ put_argument_nongnu_wrappers (Class *c)
 		}
 
 		aname = g_strdup (name);
-		g_strup (aname);
+		gob_strup (aname);
 
 		if (atype != NULL)
 			cast = get_type (atype, TRUE);
@@ -2974,7 +3168,7 @@ put_argument_gnu_wrappers(Class *c)
 		}
 
 		aname = g_strdup (name);
-		g_strup (aname);
+		gob_strup (aname);
 
 		if (atype != NULL)
 			cast = get_type (atype, TRUE);
@@ -2984,11 +3178,11 @@ put_argument_gnu_wrappers(Class *c)
 		if (cast != NULL) {
 			if (set)
 				out_printf (outh, "#define %s_PROP_%s(arg)    \t"
-					   "\"%s\",({%sz = (arg); z;})\n",
+					   "\"%s\", __extension__ ({%sz = (arg); z;})\n",
 					   macrobase, aname, name, cast);
 			if (get)
 				out_printf (outh, "#define %s_GET_PROP_%s(arg)\t"
-					   "\"%s\",({%s*z = (arg); z;})\n",
+					   "\"%s\", __extension__ ({%s*z = (arg); z;})\n",
 					   macrobase, aname, name, cast);
 		} else {
 			if (set)
@@ -3134,7 +3328,7 @@ print_class_block(Class *c)
 		    " * Main object structure\n"
 		    " */\n");
 	s = replace_sep (c->otype, '_');
-	g_strup (s);
+	gob_strup (s);
 	out_printf (outh, "#ifndef __TYPEDEF_%s__\n"
 		    "#define __TYPEDEF_%s__\n", s, s);
 	g_free (s);
@@ -3249,12 +3443,7 @@ print_class_block(Class *c)
 		    " */\n");
 
 	if ( ! overrode_get_type) {
-		out_printf (outh, "GType\t%s_get_type\t(void)", funcbase);
-		if ( ! no_gnu) {
-			out_printf (outh, " G_GNUC_CONST;\n");
-		} else {
-			out_printf (outh, ";\n");
-		}
+		out_printf (outh, "GType\t%s_get_type\t(void);\n", funcbase);
 	}
 
 	for(li = c->nodes; li != NULL; li = li->next) {
@@ -3316,13 +3505,8 @@ print_class_block(Class *c)
 	add_enums (c);
 
 	if(any_method_to_alias(c)) {
-		if( ! no_gnu) {
-			out_printf(out, "/* Short form macros */\n");
-			out_printf(out, "#if defined(__GNUC__) && !defined(__STRICT_ANSI__)\n");
-			make_method_gnu_aliases(c);
-			out_printf(out, "#endif /* __GNUC__ && !__STRICT_ANSI__ */\n");
-		}
-		make_method_nongnu_aliases(c);
+		out_printf (out, "/* Short form macros */\n");
+		make_method_aliases (c);
 	}
 
 	add_interface_inits (c);
@@ -3354,8 +3538,8 @@ print_class_block(Class *c)
 		    no_gnu ? "" : " G_GNUC_UNUSED",
 		    typebase, typebase, typebase, funcbase);
 
-	if (need_shutdown)
-		add_shutdown (c);
+	if (need_dispose)
+		add_dispose (c);
 
 	if (need_finalize)
 		add_finalize (c);
@@ -3396,6 +3580,23 @@ print_useful_macros(void)
 	out_printf (out, "#define selfp (self->_priv)\n\n");
 }
 
+static void
+print_more_useful_macros (void)
+{
+	if (no_gnu) {
+		out_printf (out, "#define ___GOB_LIKELY(expr) (expr)\n");
+		out_printf (out, "#define ___GOB_UNLIKELY(expr) (expr)\n");
+	} else {
+		out_printf (out, "#ifdef G_LIKELY\n");
+		out_printf (out, "#define ___GOB_LIKELY(expr) G_LIKELY(expr)\n");
+		out_printf (out, "#define ___GOB_UNLIKELY(expr) G_UNLIKELY(expr)\n");
+		out_printf (out, "#else /* ! G_LIKELY */\n");
+		out_printf (out, "#define ___GOB_LIKELY(expr) (expr)\n");
+		out_printf (out, "#define ___GOB_UNLIKELY(expr) (expr)\n");
+		out_printf (out, "#endif /* G_LIKELY */\n");
+	}
+}
+
 static void
 print_file_comments(void)
 {
@@ -3420,8 +3621,7 @@ print_includes(void)
 	char *p;
 
 	/* We may need string.h for memset */
-	if(destructors > 0 &&
-	   ! g_list_find_custom(include_files, "string.h", (GCompareFunc)strcmp)) {
+	if ( ! g_list_find_custom(include_files, "string.h", (GCompareFunc)strcmp)) {
 		out_printf(out, "#include <string.h> /* memset() */\n\n");
 	}
 
@@ -3461,7 +3661,7 @@ print_header_prefixes(void)
 	char *p;
 
 	p = replace_sep(((Class *)class)->otype, '_');
-	g_strup(p);
+	gob_strup (p);
 	out_printf(outh, "#ifndef __%s_H__\n#define __%s_H__\n\n", p, p);
 	if(outph)
 		out_printf(outph, "#ifndef __%s_PRIVATE_H__\n"
@@ -3542,7 +3742,7 @@ print_enum (EnumDef *enode)
 	char *str;
 
 	funcprefix = replace_sep (enode->etype, '_');
-	g_strdown (funcprefix);
+	gob_strdown (funcprefix);
 	out_printf (out, "static const GEnumValue _%s_values[] = {\n",
 		    funcprefix);
 	type = remove_sep (enode->etype);
@@ -3552,7 +3752,7 @@ print_enum (EnumDef *enode)
 	for (li = enode->values; li != NULL; li = li->next) {
 		EnumValue *value = li->data; 
 		char *p;
-		char *sname = g_strdown (g_strdup (value->name));
+		char *sname = gob_strdown (g_strdup (value->name));
 
 		while ((p = strchr (sname, '_')) != NULL)
 			*p = '-';
@@ -3565,7 +3765,7 @@ print_enum (EnumDef *enode)
 		else
 			out_printf (outh, "\n");
 
-		out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n",
+		out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n",
 			    enode->prefix, value->name,
 			    enode->prefix, value->name,
 			    sname);
@@ -3588,7 +3788,7 @@ print_enum (EnumDef *enode)
 		    "GType\n%s_get_type (void)\n"
 		    "{\n"
 		    "\tstatic GType type = 0;\n"
-		    "\tif (type == 0)\n"
+		    "\tif ___GOB_UNLIKELY(type == 0)\n"
 		    "\t\ttype = g_enum_register_static (\"%s\", _%s_values);\n"
 		    "\treturn type;\n"
 		    "}\n\n",
@@ -3608,7 +3808,7 @@ print_flags (Flags *fnode)
 	int i;
 
 	funcprefix = replace_sep (fnode->ftype, '_');
-	g_strdown (funcprefix);
+	gob_strdown (funcprefix);
 	out_printf (out, "static const GFlagsValue _%s_values[] = {\n",
 		    funcprefix);
 	type = remove_sep (fnode->ftype);
@@ -3618,7 +3818,7 @@ print_flags (Flags *fnode)
 	for (i = 0, li = fnode->values; li != NULL; i++, li = li->next) {
 		const char *name = li->data; 
 		char *p;
-		char *sname = g_strdown (g_strdup (name));
+		char *sname = gob_strdown (g_strdup (name));
 
 		while ((p = strchr (sname, '_')) != NULL)
 			*p = '-';
@@ -3630,7 +3830,7 @@ print_flags (Flags *fnode)
 		else
 			out_printf (outh, "\n");
 
-		out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n",
+		out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n",
 			    fnode->prefix, name,
 			    fnode->prefix, name,
 			    sname);
@@ -3653,7 +3853,7 @@ print_flags (Flags *fnode)
 		    "GType\n%s_get_type (void)\n"
 		    "{\n"
 		    "\tstatic GType type = 0;\n"
-		    "\tif (type == 0)\n"
+		    "\tif ___GOB_UNLIKELY(type == 0)\n"
 		    "\t\ttype = g_flags_register_static (\"%s\", _%s_values);\n"
 		    "\treturn type;\n"
 		    "}\n\n",
@@ -3672,7 +3872,7 @@ print_error (Error *enode)
 	char *str;
 
 	funcprefix = replace_sep (enode->etype, '_');
-	g_strdown (funcprefix);
+	gob_strdown (funcprefix);
 	out_printf (out, "static const GEnumValue _%s_values[] = {\n",
 		    funcprefix);
 	type = remove_sep (enode->etype);
@@ -3682,7 +3882,7 @@ print_error (Error *enode)
 	for (li = enode->values; li != NULL; li = li->next) {
 		const char *name = li->data;
 		char *p;
-		char *sname = g_strdown (g_strdup (name));
+		char *sname = gob_strdown (g_strdup (name));
 
 		while ((p = strchr (sname, '_')) != NULL)
 			*p = '-';
@@ -3693,7 +3893,7 @@ print_error (Error *enode)
 		else
 			out_printf (outh, "\n");
 
-		out_printf (out, "\t{ %s_%s, \"%s_%s\", \"%s\" },\n",
+		out_printf (out, "\t{ %s_%s, (char *)\"%s_%s\", (char *)\"%s\" },\n",
 			    enode->prefix, name,
 			    enode->prefix, name,
 			    sname);
@@ -3716,7 +3916,7 @@ print_error (Error *enode)
 		    "GType\n%s_get_type (void)\n"
 		    "{\n"
 		    "\tstatic GType type = 0;\n"
-		    "\tif (type == 0)\n"
+		    "\tif ___GOB_UNLIKELY(type == 0)\n"
 		    "\t\ttype = g_enum_register_static (\"%s\", _%s_values);\n"
 		    "\treturn type;\n"
 		    "}\n\n",
@@ -3726,7 +3926,7 @@ print_error (Error *enode)
 	out_printf (outh, "GQuark %s_quark (void);\n\n", funcprefix);
 
 	str = replace_sep (enode->etype, '-');
-	g_strdown (str);
+	gob_strdown (str);
 
 	out_printf (out,
 		    "GQuark\n%s_quark (void)\n"
@@ -3761,6 +3961,8 @@ generate_outfiles(void)
 
 	print_includes();
 
+	print_more_useful_macros ();
+
 	for (li = nodes; li != NULL; li = li->next) {
 		Node *node = li->data;
 		if (node->type == CCODE_NODE) {
@@ -3802,10 +4004,10 @@ print_help(void)
 		                          "really changed\n"
 		"\t--always-private-header Always create a private header "
 					  "file,\n"
-		"\t                        even if it would be empty "
-		                          "[default]\n"
+		"\t                        even if it would be empty\n"
 		"\t--ondemand-private-header Create private header only when "
 					  "needed\n"
+		"\t                        [default]\n"
 		"\t--no-private-header     Don't create a private header, "
 					  "put private\n"
 	  	"\t                        structure and protected "
@@ -3824,7 +4026,11 @@ print_help(void)
 		"\t--no-lines              Don't print '#line' to output\n"
 		"\t--no-self-alias         Don't create self type and macro "
 		                          "aliases\n"
-		"\t--no-kill-underscores   Ignored for compatibility\n");
+		"\t--no-kill-underscores   Ignored for compatibility\n"
+		"\t-o,--output-dir         The directory where output "
+			                  "should be placed\n"
+		"\t--file-sep[=c]          replace default \'-\' file "
+		                          "name separator\n");
 }
 
 static void
@@ -3926,6 +4132,34 @@ parse_options(int argc, char *argv[])
 			use_m4_clean=TRUE;
 			m4_opts = TRUE;
 			m4_commandline=g_strdup(M4_COMMANDLINE);
+		} else if (strcmp (argv[i], "-o") == 0 || 
+			   strcmp (argv[i], "--output-dir") == 0) {
+			if (i+1 < argc) {
+				output_dir = g_strdup (argv[i+1]);
+				i++;
+			} else {
+				output_dir = NULL;
+			}
+		} else if (strncmp (argv[i], "-o=", strlen ("-o=")) == 0 || 
+			   strncmp (argv[i],
+				    "--output-dir=",
+				    strlen ("--output-dir=")) == 0) {
+			char *p = strchr (argv[i], '=');
+			g_assert (p != NULL);
+			output_dir = g_strdup (p+1);
+		} else if (strncmp (argv[i], "--file-sep=",
+                                    strlen ("--file-sep=")) == 0) {
+			char *p = strchr (argv[i], '=');
+			g_assert (p != NULL);
+			file_sep = *(p+1);
+		} else if (strncmp (argv[i], "--file-sep",
+                                    strlen ("--file-sep")) == 0) {
+			if (i+1 < argc) {
+				file_sep = (argv[i+1])[0];
+				i++;
+			} else {
+				file_sep = 0;
+			}
 		} else if(strcmp(argv[i], "--")==0) {
 			/*further arguments are files*/
 			no_opts = TRUE;
@@ -3978,8 +4212,8 @@ parse_options(int argc, char *argv[])
 static void
 compare_and_move_header(void)
 {
-	char *hfnew = g_strconcat("#gob#", filebase, ".h#gob#", NULL);
-	char *hf = g_strconcat(filebase, ".h", NULL);
+	char *hfnew = g_strconcat(fullfilebase, ".h#gob#", NULL);
+	char *hf = g_strconcat(fullfilebase, ".h", NULL);
 	struct stat s;
 	if(stat(hf, &s) == 0) {
 		char *s;
@@ -4032,7 +4266,7 @@ main(int argc, char *argv[])
 	/* This is where parsing is done */
 	/*yydebug = 1;*/
 	if(yyparse() != 0)
-		g_error("Parsing errors, quitting");
+		error_print (GOB_ERROR, 0, "Parsing errors, quitting");
 
 	/* close input file */
 	if(use_m4) pclose(yyin);
@@ -4040,7 +4274,7 @@ main(int argc, char *argv[])
 	yyin=stdin;
 
 	if( ! class)
-		error_print(GOB_ERROR, 0, " no class defined");
+		error_print (GOB_ERROR, 0, "no class defined");
 	
 
 	exit_on_error = FALSE;
@@ -4061,8 +4295,8 @@ main(int argc, char *argv[])
 	make_bases ();
 	make_inits ((Class *)class);
 	if(unreftors > 0) {
-		need_shutdown = TRUE;
-		find_shutdown ((Class *)class);
+		need_dispose = TRUE;
+		find_dispose ((Class *)class);
 	}
 	if (destructors > 0 ||
 	    privates > 0) {
@@ -4081,6 +4315,7 @@ main(int argc, char *argv[])
 	check_property_types ((Class *)class);
 	check_argument_types ((Class *)class);
 	check_func_arg_checks ((Class *)class);
+	check_for_class_destructors ((Class *)class);
 
 	exit_on_error = TRUE;