summaryrefslogtreecommitdiff
path: root/navit/search.c
diff options
context:
space:
mode:
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-09-23 19:38:40 +0000
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-09-23 19:38:40 +0000
commitc333cd830c7bbb2f6d351651a4c262ce1cb25725 (patch)
treeda6b35be267ce42d91bba135d8dfd38f9e014ea9 /navit/search.c
parent0b14c4200dffbee64a3a3a196488eaa50b7a4bce (diff)
downloadnavit-svn-c333cd830c7bbb2f6d351651a4c262ce1cb25725.tar.gz
Add:android:Add last destinations to android search dialog, introduce class for persistent settings and some more cleanup
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4789 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/search.c')
-rw-r--r--navit/search.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/navit/search.c b/navit/search.c
index fd32d086..2687d362 100644
--- a/navit/search.c
+++ b/navit/search.c
@@ -956,11 +956,11 @@ search_address_housenumber_real(GList *result_list, struct search_list *sl, char
// ca. 9 chars : ca. 9 chars : max. 100 max. 100 max. 100 max. 15 chars -> this sould be max. about 335 chars long
if (slr->town->common.postal == NULL)
{
- buffer=g_strdup_printf("SHN:H%dL%d:%f:%f:%.101s,%.101s, %.101s %.15s",slr->street->common.item.id_hi,slr->street->common.item.id_lo,g.lat,g.lng,slr->country->name,slr->town->common.town_name,slr->street->name,slr->house_number->house_number);
+ buffer=g_strdup_printf("SHN:H%dL%d:%f:%f:%.101s, %.101s, %.101s %.15s",slr->street->common.item.id_hi,slr->street->common.item.id_lo,g.lat,g.lng,slr->country->name,slr->town->common.town_name,slr->street->name,slr->house_number->house_number);
}
else
{
- buffer=g_strdup_printf("SHN:H%dL%d:%f:%f:%.101s,%.7s %.101s, %.101s %.15s",slr->street->common.item.id_hi,slr->street->common.item.id_lo,g.lat,g.lng,slr->country->name,slr->town->common.postal,slr->town->common.town_name,slr->street->name,slr->house_number->house_number);
+ buffer=g_strdup_printf("SHN:H%dL%d:%f:%f:%.101s, %.7s %.101s, %.101s %.15s",slr->street->common.item.id_hi,slr->street->common.item.id_lo,g.lat,g.lng,slr->country->name,slr->town->common.postal,slr->town->common.town_name,slr->street->name,slr->house_number->house_number);
}
// deactivated now * result_list=g_list_prepend(result_list,g_strdup(buffer));
#ifdef HAVE_API_ANDROID
@@ -1081,11 +1081,11 @@ search_address_street(GList *result_list, struct search_list *sl, GList *phrases
// TWN -> town
if (slr->town->common.postal == NULL)
{
- buffer=g_strdup_printf("TWN:H%dL%d:%f:%f:%.101s,%.101s",slr->town->common.item.id_hi,slr->town->common.item.id_lo,g.lat,g.lng,slr->country->name,slr->town->common.town_name);
+ buffer=g_strdup_printf("TWN:H%dL%d:%f:%f:%.101s, %.101s",slr->town->common.item.id_hi,slr->town->common.item.id_lo,g.lat,g.lng,slr->country->name,slr->town->common.town_name);
}
else
{
- buffer=g_strdup_printf("TWN:H%dL%d:%f:%f:%.101s,%.7s %.101s",slr->town->common.item.id_hi,slr->town->common.item.id_lo,g.lat,g.lng,slr->country->name,slr->town->common.postal,slr->town->common.town_name);
+ buffer=g_strdup_printf("TWN:H%dL%d:%f:%f:%.101s, %.7s %.101s",slr->town->common.item.id_hi,slr->town->common.item.id_lo,g.lat,g.lng,slr->country->name,slr->town->common.postal,slr->town->common.town_name);
}
// deactivated now * result_list=g_list_prepend(result_list,g_strdup(buffer));
#ifdef HAVE_API_ANDROID
@@ -1158,7 +1158,7 @@ GList *
search_by_address(struct search_list *sl, const char *addr, int partial, struct jni_object *jni)
{
char *str=search_fix_spaces(addr);
- GList *tmp,*phrases=search_split_phrases(str);
+ GList *phrases=search_split_phrases(str);
GList *ret = NULL;
dbg(0,"enter %s\n",addr);
ret=search_address_town(ret, sl, phrases, NULL, partial, jni);