Add:GUI: Adds in the display of the county_name to GUI Internal in the format TOWN_NA...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4469 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/gui/internal/gui_internal.c b/navit/navit/gui/internal/gui_internal.c
index dc939fd..d6f242e 100644 (file)
--- a/navit/navit/gui/internal/gui_internal.c
+++ b/navit/navit/gui/internal/gui_internal.c
@@ -3214,12 +3214,16 @@ town_str(struct search_list_result *res, int level, int flags)
        char *postal_sep=" ";
        char *district_begin=" (";
        char *district_end=")";
+       char *county_sep = ", Co. ";
+       char *county = res->town->common.county_name;
        if (!postal)
                postal_sep=postal="";
        if (!district || (flags & 1))
                district_begin=district_end=district="";
+       if (!county)
+               county_sep=county="";
 
-       return g_strdup_printf("%s%s%s%s%s%s", postal, postal_sep, town, district_begin, district, district_end);
+       return g_strdup_printf("%s%s%s%s%s%s%s%s", postal, postal_sep, town, district_begin, district, district_end, county_sep, county);
 }
 
 static void