Description: Install icons into NAVIT_SHAREDIR/icons
 It doesn't make sense to put icons into a directory named "xpm" since most
 of them are png and svg files.
Author: Gilles Filippini <pini@debian.org>
Forwarded: http://trac.navit-project.org/ticket/681
Last-Update: 2011-04-17
Index: navit/CMakeLists.txt
===================================================================
--- navit.orig/CMakeLists.txt	2011-09-11 19:43:48.000000000 +0200
+++ navit/CMakeLists.txt	2011-09-11 19:43:55.000000000 +0200
@@ -26,7 +26,7 @@
 set(BIN_DIR bin)
 set(SHARE_DIR share/navit)
 set(LOCALE_DIR share/locale)
-set(IMAGE_DIR share/navit/xpm)
+set(IMAGE_DIR share/navit/icons)
 set(LIB_DIR lib)
 
 foreach(EXTRA_MODULE ${EXTRA_MODULES}) 
@@ -402,7 +402,7 @@
    set(BIN_DIR bin)
    set(SHARE_DIR ./)
    set(LOCALE_DIR locale)
-   set(IMAGE_DIR xpm)
+   set(IMAGE_DIR icons)
 
    
    if(HAVE_GTK2 AND NOT MSVC)
Index: navit/navit/graphics.c
===================================================================
--- navit.orig/navit/graphics.c	2011-09-11 19:43:48.000000000 +0200
+++ navit/navit/graphics.c	2011-09-11 19:43:55.000000000 +0200
@@ -1682,7 +1682,7 @@
 #else
 		if (! navit_sharedir)
 			navit_sharedir = getenv("NAVIT_SHAREDIR");
-		ret=g_strdup_printf("%s/xpm/%s", navit_sharedir, icon);
+		ret=g_strdup_printf("%s/icons/%s", navit_sharedir, icon);
 #endif
 	}
 	if (wordexp)
Index: navit/navit/gui/qml/gui_qml.cpp
===================================================================
--- navit.orig/navit/gui/qml/gui_qml.cpp	2011-09-11 19:43:48.000000000 +0200
+++ navit/navit/gui/qml/gui_qml.cpp	2011-09-11 19:43:55.000000000 +0200
@@ -456,7 +456,7 @@
 		this_->skin=g_strdup("navit");
 	}
 	if ( this_->icon_src==NULL ) {
-		this_->icon_src=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"),"/xpm/",NULL);
+		this_->icon_src=graphics_icon_path("");
 	}
 
 	if ((attr=attr_search(attrs, NULL, attr_callback_list))) {
