Merge branch 'upstream' into maemo

[navit-package] / navit / navit_shipped.xml

diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index c326ce7..54fb886 100644 (file)
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -29,10 +29,10 @@
                [-]0xX [-]0xX -->
 
        <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10">
-               <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use opengl -->
+               <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. -->
                <graphics type="gtk_drawing_area"/>
                <!-- The following line let you select which graphical user interface you'd like to use.
-               Options include internal (optimized for touch screen devices), gtk (useful for desktop computers) and cegui.
+               Options include internal (optimized for touch screen devices), gtk (useful for desktop computers).
                If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag -->
                <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/>
        <!--
@@ -3282,6 +3282,8 @@ Navigation</text></img>
                                </itemgra>
                        </cursor>
 
+                       <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
+                       <!-- <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
                        <layer name="Landuse">
                                <itemgra item_types="image" order="0-">
                                        <image/>
@@ -4083,8 +4085,6 @@ Navigation</text></img>
                                        <text text_size="9"/>
                                </itemgra>
                        </layer>
-                       <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
-                       <!-- <xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
                        <layer name="Unknown Elements">
                                <!-- This entry shows all unknown linear elements as blue lines -->
                                <!--