From ee275be5e5bb94fea1540240d80529db0c224eb5 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 6 Mar 2014 16:02:23 +0900 Subject: [PATCH] Fix the last change --- libkkc/key-event.vala | 5 +++-- libkkc/user-sentence-dictionary.vala | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libkkc/key-event.vala b/libkkc/key-event.vala index 46be8ce..c9d68c4 100644 --- a/libkkc/key-event.vala +++ b/libkkc/key-event.vala @@ -191,8 +191,9 @@ namespace Kkc { elements.add (null); // make sure that strv ends with null // newer valac thinks null in a fixed length array as // an empty string - elements.length = -1; - return "(" + string.joinv (" ", elements.to_array ()) + ")"; + var array = elements.to_array (); + array.length = -1; + return "(" + string.joinv (" ", array) + ")"; } else { return _base; } diff --git a/libkkc/user-sentence-dictionary.vala b/libkkc/user-sentence-dictionary.vala index c40094c..ee19134 100644 --- a/libkkc/user-sentence-dictionary.vala +++ b/libkkc/user-sentence-dictionary.vala @@ -254,13 +254,13 @@ namespace Kkc { // Make sure to null terminate so joinv determine the end of strv. input.add (null); + // Newer valac thinks null in a fixed length array as an // empty string. - input.length = -1; - constraint_entries.set (string.joinv ("", input.to_array ()), - constraint); - phrase_entries.set (string.joinv (" ", input.to_array ()), - phrase); + var array = input.to_array (); + array.length = -1; + constraint_entries.set (string.joinv ("", array), constraint); + phrase_entries.set (string.joinv (" ", array), phrase); is_dirty = true; return true; }