Avoid more GLib deprecation warnings.

[gob-dx.git] / src / parse.y

diff --git a/src/parse.y b/src/parse.y
index 1831ad067cd6eb8d7fae0d1b351bfd24142c93a8..46df2d692c61dc5c217655289fdf446b49f6473c 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -22,7 +22,7 @@
  */
 %{
 
-#include "config.h"
+#include <config.h>
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,6 +45,7 @@ static GList *flag_vals = NULL;
 static GList *error_vals = NULL;
 
 static gboolean abstract = FALSE;
+static gboolean dynamic = FALSE;
 static char *chunk_size = NULL;
 static char *bonobo_object_class = NULL;
 static int glade_xml = FALSE;
@@ -415,15 +416,15 @@ export_accessors (const char *var_name,
                                        "pointer", "*",
                                        NULL);
 
-               g_string_sprintf (get_cbuf,
-                                 "\t%s%s val; "
-                                 "g_object_get (G_OBJECT (self), \"%s\", "
-                                 "&val, NULL); "
-                                 "return val;\n",
-                                 the_type->name, 
-                                 the_type->pointer ? the_type->pointer : "",
-                                 var_name);
-               
+               g_string_printf(get_cbuf,
+                               "\t%s%s val; "
+                               "g_object_get (G_OBJECT (self), \"%s\", "
+                               "&val, NULL); "
+                               "return val;\n",
+                               the_type->name,
+                               the_type->pointer ? the_type->pointer : "",
+                               var_name);
+
                typestack = g_list_prepend (typestack, node1);
                typestack = g_list_prepend (typestack, node3);
                
@@ -450,10 +451,10 @@ export_accessors (const char *var_name,
                                        "pointer", "*",
                                        NULL);
 
-               g_string_sprintf (set_cbuf,
-                                 "\tg_object_set (G_OBJECT (self), "
-                                 "\"%s\", val, NULL);\n",
-                                 var_name);
+               g_string_printf(set_cbuf,
+                               "\tg_object_set (G_OBJECT (self), "
+                               "\"%s\", val, NULL);\n",
+                               var_name);
 
                typestack = g_list_prepend (typestack, node2);
                typestack = g_list_prepend (typestack, node1);
@@ -613,9 +614,9 @@ property_link_and_export (Node *node)
                        const char *setcast = "";
                        char *to_free = NULL;
                        set_func = g_strdup_printf ("g_value_set_%s", prop->gtktype);
-                       g_strdown (set_func);
+                       gob_strdown (set_func);
                        get_func = g_strdup_printf ("g_value_get_%s", prop->gtktype);
-                       g_strdown (get_func);
+                       gob_strdown (get_func);
 
                        if (for_cpp) {
                                if (strcmp (prop->gtktype, "FLAGS") == 0) {
@@ -821,6 +822,7 @@ classdec:   CLASS TYPETOKEN FROM TYPETOKEN  classflags {
                                          "interfaces:steal", interfaces,
                                          "chunk_size:steal", chunk_size,
                                          "abstract", abstract,
+                                         "dynamic", dynamic,
                                          NULL);
                        bonobo_object_class = NULL;
                        glade_xml = FALSE;
@@ -833,6 +835,8 @@ classflags:
        | '(' TOKEN ')' classflags {
                        if(strcmp($<id>2,"abstract") == 0) {
                                abstract = TRUE;
+                       } else if(strcmp($<id>2,"dynamic") == 0) {
+                               dynamic = TRUE;
                        } else {
                                yyerror(_("parse error"));
                                YYERROR;