Release 2.0.18

[gob-dx.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f3142ada93025d7a52904ed651cbb29b765b1b73..734efa45dd79d81ec8c9b8708a9a9063fa5f61bc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /* GOB C Preprocessor
  * Copyright (C) 1999,2000 the Free Software Foundation.
  * Copyright (C) 2000 Eazel, Inc.
- * Copyright (C) 2001-2009 George (Jiri) Lebl
+ * Copyright (C) 2001-2011 George (Jiri) Lebl
  *
  * Author: George (Jiri) Lebl
  *
@@ -1613,13 +1613,13 @@ make_argument (Argument *a)
                           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"
+                          "\t\t-G_MAXFLOAT, G_MAXFLOAT,\n"
                           "\t\t0,\n"
                           "\t\t%s);\n",
                           a->name, flags->str);
        else if (!strcmp (a->gtktype, "DOUBLE"))
                out_printf(out, "\tparam_spec = g_param_spec_double (\"%s\", NULL, NULL,\n"
-                          "\t\tG_MINDOUBLE, G_MAXDOUBLE,\n"
+                          "\t\t-G_MAXDOUBLE, G_MAXDOUBLE,\n"
                           "\t\t0,\n"
                           "\t\t%s);\n",
                           a->name, flags->str);
@@ -1655,22 +1655,22 @@ make_property (Property *p)
        if (p->override) {
                if (p->flags != NULL)
                        error_print (GOB_WARN, p->line_no,
-                                    "Overriden property, flags ignored");
+                                    "Overridden property, flags ignored");
                if (p->nick != NULL)
                        error_print (GOB_WARN, p->line_no,
-                                    "Overriden property, nick ignored");
+                                    "Overridden property, nick ignored");
                if (p->blurb != NULL)
                        error_print (GOB_WARN, p->line_no,
-                                    "Overriden property, blurb ignored");
+                                    "Overridden property, blurb ignored");
                if (p->minimum != NULL)
                        error_print (GOB_WARN, p->line_no,
-                                    "Overriden property, minimum ignored");
+                                    "Overridden property, minimum ignored");
                if (p->maximum != NULL)
                        error_print (GOB_WARN, p->line_no,
-                                    "Overriden property, maximum ignored");
+                                    "Overridden property, maximum ignored");
                if (p->default_value != NULL)
                        error_print (GOB_WARN, p->line_no,
-                                    "Overriden property, default_value ignored");
+                                    "Overridden property, default_value ignored");
 
                s = g_strdup (p->name);
                gob_strup (s);
@@ -1917,7 +1917,7 @@ make_property (Property *p)
                                    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->minimum, "-G_MAXFLOAT"),
                                    value_for_print (p->maximum, "G_MAXFLOAT"),
                                    value_for_print (p->default_value, "0.0"),
                                    flags->str);
@@ -1933,7 +1933,7 @@ make_property (Property *p)
                                    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->minimum, "-G_MAXDOUBLE"),
                                    value_for_print (p->maximum, "G_MAXDOUBLE"),
                                    value_for_print (p->default_value, "0.0"),
                                    flags->str);
@@ -3390,6 +3390,7 @@ print_ccode_block(CCode *cc)
                out_addline_infile(fp, cc->line_no);
                break;
        default:
+       case CT_CCODE:
        case C_CCODE:
                fp = out;
                out_printf(fp, "\n");
@@ -3924,12 +3925,13 @@ print_all_top(void)
 {
        GList *li;
 
-       /* print the AT_CCODE blocks */
+       /* print the AT_CCODE and CT_CCODE blocks */
        for(li = nodes; li != NULL; li = li->next) {
                Node *node = li->data;
                if(node->type == CCODE_NODE) {
                        CCode *cc = (CCode *)node;
-                       if(cc->cctype == AT_CCODE)
+                       if (cc->cctype == AT_CCODE ||
+                           cc->cctype == CT_CCODE)
                                print_ccode_block((CCode *)node);
                }
        }
@@ -4256,7 +4258,8 @@ print_help(void)
                "\t-o,--output-dir         The directory where output "
                                          "should be placed\n"
                "\t--file-sep[=c]          replace default \'-\' file "
-                                         "name separator\n");
+                                         "name separator\n\n");
+       fprintf(stderr, "End world hunger, donate to the World Food Programme, http://www.wfp.org\n");
 }
 
 static void
@@ -4516,7 +4519,7 @@ int
 main(int argc, char *argv[])
 {
        parse_options(argc, argv);
-       
+
        if(use_m4) {
                yyin = popen(m4_commandline, "r");
                if(!yyin) {