--- trunk/src/main.c	2009/12/09 19:45:36	233
+++ trunk/src/main.c	2009/12/10 21:24:43	237
@@ -306,11 +306,11 @@
   }
 
   if(redraw) {
-    GtkWidget *container = appdata->vbox;
-
 #ifdef USE_STACKABLE_WINDOW
     HildonWindowStack *stack = hildon_window_stack_get_default();
-    container = hildon_window_stack_peek(stack);
+    GtkWidget *container = hildon_window_stack_peek(stack);
+#else
+    GtkWidget *container = appdata->vbox;
 #endif
 
     gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
@@ -326,11 +326,10 @@
     }
 
 #ifdef USE_STACKABLE_WINDOW
-    if(container != appdata->vbox)
-      gtk_container_add(GTK_CONTAINER(container), appdata->cur_view); 
-    else
+    gtk_container_add(GTK_CONTAINER(container), appdata->cur_view); 
+#else
+    gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
 #endif
-      gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
     
     gtk_widget_show_all(container);
   }
@@ -975,6 +974,8 @@
 
   appdata->gpxview = gtk_tree_view_new ();
 
+  printf("building gpx list, items = %d\n", appdata->gpxlist_items);
+
   GtkTreeSelection *selection = 
     gtk_tree_view_get_selection(GTK_TREE_VIEW(appdata->gpxview));
 #ifndef USE_PANNABLE_AREA
@@ -2262,11 +2263,12 @@
   }
 
   if(redraw) {
-    GtkWidget *container = appdata->vbox;
 
 #ifdef USE_STACKABLE_WINDOW
     HildonWindowStack *stack = hildon_window_stack_get_default();
-    container = hildon_window_stack_peek(stack);
+    GtkWidget *container = hildon_window_stack_peek(stack);
+#else
+    GtkWidget *container = appdata->vbox;
 #endif
 
     gtk_container_remove(GTK_CONTAINER(container), appdata->cur_view);
@@ -2285,11 +2287,10 @@
     }
 
 #ifdef USE_STACKABLE_WINDOW
-    if(container != appdata->vbox)
       gtk_container_add(GTK_CONTAINER(container), appdata->cur_view); 
-    else
-#endif
+#else
       gtk_box_pack_start_defaults(GTK_BOX(container), appdata->cur_view);
+#endif
     
     gtk_widget_show_all(container);
   }
@@ -2369,9 +2370,9 @@
   appdata.clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_can_store(appdata.clipboard, NULL, 0);
 
+#ifndef USE_STACKABLE_WINDOW
   appdata.vbox = gtk_vbox_new(FALSE, 2);
   gtk_container_add(GTK_CONTAINER(appdata.window), appdata.vbox);
-#ifndef USE_STACKABLE_WINDOW
   menu_create(&appdata);
 #else
   hildon_window_set_app_menu(HILDON_WINDOW(appdata.window), 
@@ -2407,7 +2408,11 @@
   gps_init(&appdata);
 
   appdata.cur_view = gpxlist_create_view_and_model(&appdata, NULL);
+#ifndef USE_STACKABLE_WINDOW
   gtk_box_pack_start_defaults(GTK_BOX(appdata.vbox), appdata.cur_view);
+#else
+  gtk_container_add(GTK_CONTAINER(appdata.window), appdata.cur_view);
+#endif
 
   gtk_widget_show_all(GTK_WIDGET(appdata.window));
   gtk_main();