Release 2.0.18

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

diff --git a/src/main.c b/src/main.c
index fab7a2e0d46c5cd718d9c4d4f96607c014b23738..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
  *
@@ -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);
@@ -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);
                }
        }