--- trunk/src/main.c	2009/06/26 12:24:24	11
+++ trunk/src/main.c	2009/06/26 20:07:33	12
@@ -811,10 +811,14 @@
 	gpx_busy_dialog_destroy(dialog);
       }
 #ifndef USE_BREAD_CRUMB_TRAIL
+#ifdef USE_STACKABLE_WINDOW
       if(!appdata->cur_gpx)
+#endif
 	cachelist_dialog(appdata, gpx);
+#ifdef USE_STACKABLE_WINDOW
       else
 	printf("selected gpx, but cachelist window already present\n");
+#endif
 #else
       gtk_container_remove(GTK_CONTAINER(appdata->vbox), appdata->cur_view);
       appdata->cur_view = cachelist_create(appdata, gpx, NULL);
@@ -1382,14 +1386,15 @@
       printf("Search for %s (flags = %x)...\n", p, appdata->search);
 
 #ifndef USE_BREAD_CRUMB_TRAIL
-      appdata->search_results = 
+      gpx_t *found =
 	search_do(appdata, appdata->gpx, p, appdata->search, FALSE);
 
       /* do search result dialog here ... */
-      cachelist_dialog(appdata, appdata->search_results);
+      cachelist_dialog(appdata, found);
 #ifndef USE_STACKABLE_WINDOW
-      search_result_free(appdata->search_results);
-      appdata->search_results = NULL;
+      search_result_free(found);
+#else
+      appdata->search_results = found;
 #endif
 #else
       gpx_t *found = NULL;
@@ -1656,7 +1661,7 @@
 			 G_CALLBACK(on_tools_clicked), appdata);
   hildon_app_menu_append(menu, GTK_BUTTON(button));
 
-  gtk_widget_show(GTK_WIDGET(menu));
+  //  gtk_widget_show(GTK_WIDGET(menu));
 
   return menu;
 }
@@ -2184,7 +2189,10 @@
   gtk_window_set_default_size(GTK_WINDOW(appdata.window), 500, 300);
 #endif
 
+#if MAEMO_VERSION_MAJOR == 5
   gtk_window_set_title(GTK_WINDOW(appdata.window), "GPXView");
+#endif
+
   g_signal_connect(G_OBJECT(appdata.window), "destroy", 
 		   G_CALLBACK(on_window_destroy), &appdata);