From b7c785a8f7b5c071c6a55419286cb24d19735331 Mon Sep 17 00:00:00 2001 From: William Hua Date: Fri, 21 Jun 2013 13:56:38 -0400 Subject: Simplify abbreviations. --- data/main.vala | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/main.vala b/data/main.vala index 9be80ebf..dec6e6cf 100644 --- a/data/main.vala +++ b/data/main.vala @@ -72,16 +72,11 @@ int main (string[] args) { var occurrences = new Gee.HashMap (); layouts.foreach ((name) => { - string display; - string layout; + string short_name; - info.get_layout_info (name, out display, null, out layout, null); + info.get_layout_info (name, null, out short_name, null, null); - if (display == null) { - display = get_display_name (layout); - } - - var abbreviation = get_abbreviation (display); + var abbreviation = get_abbreviation (short_name); if (!occurrences.has_key (abbreviation)) { occurrences[abbreviation] = 1; -- cgit v1.2.3