From 7e85291a2a67fd5897ca66bd782ab79fa688848a Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 18 Jan 2018 23:08:30 +0100
Subject: [PATCH] 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 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/vala/valacodewriter.vala b/vala/valacodewriter.vala
index 8c0e68804..2fed2d8f5 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;
-- 
2.11.4.GIT