diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2019-06-04 10:14:17 -0600 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2019-06-04 10:14:17 -0600 |
| commit | 92a5169423e470e4d1a5f4237cb2112266998d28 (patch) | |
| tree | bee5f13203e0a0d99c8f6962c82deef9fe772b6e /navit/gui/qt5_qml/proxy.c | |
| parent | 5304cda121782db8e1e5e4685ae10780cce36394 (diff) | |
| parent | da3e1e0c186dfd6c6566f798811a27d001a7fb1d (diff) | |
| download | navit-audio.tar.gz | |
Merge branch 'trunk' into audioaudio
Diffstat (limited to 'navit/gui/qt5_qml/proxy.c')
| -rw-r--r-- | navit/gui/qt5_qml/proxy.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/navit/gui/qt5_qml/proxy.c b/navit/gui/qt5_qml/proxy.c index 6a3546716..399925519 100644 --- a/navit/gui/qt5_qml/proxy.c +++ b/navit/gui/qt5_qml/proxy.c @@ -11,8 +11,7 @@ #include "search.h" -char * get_icon(struct navit *nav, struct item *item) -{ +char * get_icon(struct navit *nav, struct item *item) { struct attr layout; struct attr icon_src; @@ -25,7 +24,7 @@ char * get_icon(struct navit *nav, struct item *item) while(itemgra) { GList *types=((struct itemgra *)itemgra->data)->type; while(types) { - if((long)types->data==item->type) { + if((long)types->data==item->type) { GList *element=((struct itemgra *)itemgra->data)->elements; while(element) { struct element * el=element->data; @@ -41,12 +40,10 @@ char * get_icon(struct navit *nav, struct item *item) if(!src || !src[0]) src="%s"; icon=g_strdup_printf(src,map_convert_string_tmp(item->map,icon_src.u.str)); - } - else { + } else { icon=g_strdup(el->u.icon.src); } - } - else { + } else { icon=g_strdup(el->u.icon.src); } icon[strlen(icon)-3]='s'; |