Avoid more GLib deprecation warnings.

The g_string_sprintf and g_string_sprintfa macros throw deprecation
warnings with recent GLib versions.  It seems these have been simple
shims over g_string_printf and g_string_append_printf, respectively,
since approximately forever ago (before GLib 2.0).  Should be safe
to just switch, then.

diff --git a/src/main.c b/src/main.c
index 6436cde678fdb97f8702808e2aabaa93b836317d..8e6c04e0feb1f15420ce11b163c200d57b863c30 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1507,7 +1507,7 @@ make_run_signal_flags(Method *m, gboolean last)
                                     "perhaps it was misspelled",
                                     flag);
                }
-               g_string_sprintfa(gs, " | G_SIGNAL_%s", flag);
+               g_string_append_printf(gs, " | G_SIGNAL_%s", flag);
        }
 
        {
@@ -1731,7 +1731,7 @@ make_argument (Argument *a)
                        if(strcmp(argflags[i], flag)==0)
                                break;
                }
-               g_string_sprintfa(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag);
+               g_string_append_printf(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag);
        }
 
        g_string_append (flags, ")");
@@ -1921,7 +1921,7 @@ make_property (Property *p)
                                if(strcmp(argflags[i], flag)==0)
                                        break;
                        }
-                       g_string_sprintfa(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag);
+                       g_string_append_printf(flags, " | %s%s", argflags[i] ? "G_PARAM_" : "", flag);
                }
 
                g_string_append (flags, ")");
@@ -3169,7 +3169,7 @@ get_arg_names_for_macro (Method *m)
        sep = "";
        for(li=m->args;li;li=g_list_next(li)) {
                FuncArg *arg = li->data;
-               g_string_sprintfa (gs, "%s___%s", sep, arg->name);
+               g_string_append_printf(gs, "%s___%s", sep, arg->name);
                sep = ",";
        }
        return g_string_free (gs, FALSE);

diff --git a/src/parse.y b/src/parse.y
index d77fb544ca8054281615b23394e33152549b299e..46df2d692c61dc5c217655289fdf446b49f6473c 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -416,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);
                
@@ -451,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);