--- navit.old/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c	2007-11-04 18:22:22.000000000 -0300
+++ navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c	2007-11-09 19:17:39.000000000 -0300
@@ -60,9 +60,9 @@
 {
 }
 
+#ifndef USE_HILDON_
 static char *fontpaths[]={
-	"/usr/share/fonts/",
	"/usr/share/fonts/truetype/ttf-bitstream-vera/",
 	"/usr/X11R6/lib/X11/fonts/msttcorefonts",
 	"/usr/X11R6/lib/X11/fonts/truetype",
 	"/usr/share/fonts/truetype",
@@ -74,7 +74,6 @@
 
 #if 0
 static char *fontlist_bd[]={
-	"/usr/share/fonts/NcrBI4nh.ttf",
 	"/usr/X11R6/lib/X11/fonts/msttcorefonts/arialbd.ttf",
 	"/usr/X11R6/lib/X11/fonts/truetype/arialbd.ttf",
 	"/usr/share/fonts/truetype/msttcorefonts/arialbd.ttf",
@@ -84,7 +83,7 @@
 };
 #endif
 
-
+#endif /*USE_HILDON*/ 
 
 static void font_destroy(struct graphics_font_priv *font)
 {
@@ -98,8 +97,12 @@
 
 static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size)
 {
+#ifndef USE_HILDON
 	char **filename=fontpaths;
 	char fontpath [256];
+#else
+	char *fontpath = "/usr/share/fonts/NcrBI4nh.ttf";
+#endif /*USE_HILDON*/
 
 	struct graphics_font_priv *font=g_new(struct graphics_font_priv, 1);
 
@@ -109,6 +112,14 @@
 		FT_Init_FreeType( &gr->library );
 		gr->library_init=1;
 	}
+#ifdef USE_HILDON
+	if (FT_New_Face( gr->library, fontpath, 0, &font->face )) {
+                g_warning("Failed to load maemo font");
+                g_free(font);
+                return NULL;
+	}
+
+#else
 	while (*filename) {
 		// Trying the Liberation font first
 		sprintf(fontpath,"%s/LiberationSans-Regular.ttf",*filename);
@@ -120,10 +131,6 @@
 		dbg(1,("font : %s\n",fontpath));
 	    	if (!FT_New_Face( gr->library, fontpath, 0, &font->face ))
 			break;
-		sprintf(fontpath,"%s/NcrBI4nh.ttf",*filename);
-		dbg(1,("font : %s\n",fontpath));
-		if (!FT_New_Face( gr->library, fontpath, 0, &font->face ))
-			break;
 		filename++;
 	}
 	if (! *filename) {
@@ -131,6 +138,7 @@
 		g_free(font);
 		return NULL;
 	}
+#endif /*USE_HILDON*/
         FT_Set_Char_Size(font->face, 0, size, 300, 300);
 	FT_Select_Charmap(font->face, FT_ENCODING_UNICODE);
 	return font;