[vala/staging] codewriter: Don't use string.replace() to apply header_to_override

[Rico Tzschichholz <ricotz src gnome org>]

commit 5a7300d6f40acb650c45b545ad14e0524e0b6dd7
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Jan 18 23:08:30 2018 +0100

    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

 vala/valacodewriter.vala |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index 8c0e688..2fed2d8 100644
--- a/vala/valacodewriter.vala
+++ b/vala/valacodewriter.vala
@@ -214,7 +214,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;