codewriter: Don't use string.replace() to apply header_to_override

The underlying regex causes faulty replacements.

https://bugzilla.gnome.org/show_bug.cgi?id=731322

diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index ec48ed03dd4c32dfd10125350dc54a376f022947..7318c35a6c3594cb198893c5992ff5315a85aa46 100644 (file)
--- a/vala/valacodewriter.vala
+++ b/vala/valacodewriter.vala
@@ -212,7 +212,13 @@ public class Vala.CodeWriter : CodeVisitor {
                        }
 
                        if (header_to_override != null) {
-                               cheaders = cheaders.replace (header_to_override, override_header).replace (",,", ",");
+                               var cheaders_array = cheaders.split (",");
+                               for (int i = 0; i < cheaders_array.length; i++) {
+                                       if (cheaders_array[i] == header_to_override) {
+                                               cheaders_array[i] = override_header;
+                                       }
+                               }
+                               cheaders = string.joinv (",", cheaders_array);
                        }
                }
                return cheaders;