Fixes to gstreamer element and caps handlings.

[mapper] / src / cb.c

diff --git a/src/cb.c b/src/cb.c
index ca6c29209dcc3bfb4ec2e4f0e0bc1fe38da485f3..41cd62e7e4f37f69b71b7238f9125e90c2214e99 100644 (file)
--- a/src/cb.c
+++ b/src/cb.c
@@ -60,19 +60,27 @@
 #include "gps-conn.h"
 #include "search.h"
 #include "dialogs.h"
+#include "filter-gui.h"
 #include "help.h"
+#include "map-repo.h"
 
-gboolean 
-menu_cb_route_download(GtkAction * action)
+static void
+track_tree_view_update_store(GtkWidget *tree_view, Path *track)
 {
 GtkListStore *store;
 
-route_download(NULL);
-store=route_generate_store(&_route);
+store=path_generate_store(track);
 if (store!=NULL) {
-       gtk_tree_view_set_model(route_tree_view, store);
+       gtk_tree_view_set_model(tree_view, store);
        g_object_unref(G_OBJECT(store));
 }
+}
+
+gboolean 
+menu_cb_route_download(GtkAction * action)
+{
+route_download(NULL);
+track_tree_view_update_store(route_tree_view, &_route);
 return TRUE;
 }
 
@@ -82,11 +90,7 @@ menu_cb_route_open(GtkAction * action)
 GtkListStore *store;
 
 route_open_file();
-store=route_generate_store(&_route);
-if (store!=NULL) {
-       gtk_tree_view_set_model(route_tree_view, store);
-       g_object_unref(G_OBJECT(store));
-}
+track_tree_view_update_store(route_tree_view, &_route);
 return TRUE;
 }
 
@@ -125,6 +129,7 @@ gboolean
 menu_cb_track_open(GtkAction * action)
 {
 track_open();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -132,6 +137,7 @@ gboolean
 menu_cb_track_save(GtkAction * action)
 {
 track_save();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -139,6 +145,7 @@ gboolean
 menu_cb_track_insert_break(GtkAction * action)
 {
 track_insert_break();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -146,6 +153,7 @@ gboolean
 menu_cb_track_insert_mark(GtkAction * action)
 {
 track_insert_mark();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -174,13 +182,14 @@ gboolean
 menu_cb_track_clear(GtkAction * action)
 {
 track_clear();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
 gboolean 
 menu_cb_track_filter(GtkAction * action)
 {
-filter_dialog();
+filter_dialog(_window);
 return TRUE;
 }
 
@@ -519,6 +528,14 @@ settings_dialog_osm();
 return TRUE;
 }
 
+gboolean 
+menu_cb_import_osm(GtkAction * action)
+{
+osm_import_dialog(_window);
+return TRUE;
+}
+
+
 gboolean 
 menu_cb_help(GtkAction * action)
 {