[QA] Make more local functions static.

[andy/viking.git] / src / acquire.c

diff --git a/src/acquire.c b/src/acquire.c
index a48442bd3567c33689ec695648bfdd6929366446..5d8d4025c131a18b80c57ff3c8f3e5d16da32c61 100644 (file)
--- a/src/acquire.c
+++ b/src/acquire.c
@@ -34,7 +34,6 @@
 
 /************************ FILTER LIST *******************/
 // extern VikDataSourceInterface vik_datasource_gps_interface;
-// extern VikDataSourceInterface vik_datasource_google_interface;
 
 /*** Input is TRWLayer ***/
 extern VikDataSourceInterface vik_datasource_bfilter_simplify_interface;
@@ -153,8 +152,10 @@ static void get_from_anything ( w_and_interface_t *wi )
       gtk_label_set_text ( GTK_LABEL(w->status), _("Done.") );
       if ( creating_new_layer ) {
        /* Only create the layer if it actually contains anything useful */
+       // TODO: create function for this operation to hide detail:
        if ( g_hash_table_size (vik_trw_layer_get_tracks(vtl)) ||
-            g_hash_table_size (vik_trw_layer_get_waypoints(vtl)) ) {
+            g_hash_table_size (vik_trw_layer_get_waypoints(vtl)) ||
+            g_hash_table_size (vik_trw_layer_get_routes(vtl)) ) {
          vik_layer_post_read ( VIK_LAYER(vtl), w->vvp, TRUE );
          vik_aggregate_layer_add_layer( vik_layers_panel_get_top_layer(w->vlp), VIK_LAYER(vtl));
        }
@@ -198,8 +199,9 @@ static gchar *write_tmp_trwlayer ( VikTrwLayer *vtl )
   gchar *name_src;
   FILE *f;
   g_assert ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) >= 0);
+  g_debug ("%s: temporary file: %s", __FUNCTION__, name_src);
   f = fdopen(fd_src, "w");
-  a_gpx_write_file(vtl, f);
+  a_gpx_write_file(vtl, f, NULL);
   fclose(f);
   f = NULL;
   return name_src;
@@ -212,8 +214,9 @@ static gchar *write_tmp_track ( VikTrack *track )
   gchar *name_src;
   FILE *f;
   g_assert ((fd_src = g_file_open_tmp("tmp-viking.XXXXXX", &name_src, NULL)) >= 0);
+  g_debug ("%s: temporary file: %s", __FUNCTION__, name_src);
   f = fdopen(fd_src, "w");
-  a_gpx_write_track_file(track, f); /* Thank you Guilhem! Just when I needed this function... -- Evan */
+  a_gpx_write_track_file(track, f, NULL); /* Thank you Guilhem! Just when I needed this function... -- Evan */
   fclose(f);
   f = NULL;
   return name_src;
@@ -439,7 +442,7 @@ static GtkWidget *acquire_build_menu ( VikWindow *vw, VikLayersPanel *vlp, VikVi
 
 GtkWidget *a_acquire_trwlayer_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrwLayer *vtl)
 {
-  return acquire_build_menu ( vw, vlp, vvp, vtl, NULL, "_Filter", VIK_DATASOURCE_INPUTTYPE_TRWLAYER );
+  return acquire_build_menu ( vw, vlp, vvp, vtl, NULL, _("_Filter"), VIK_DATASOURCE_INPUTTYPE_TRWLAYER );
 }
 
 GtkWidget *a_acquire_trwlayer_track_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrwLayer *vtl)
@@ -447,7 +450,7 @@ GtkWidget *a_acquire_trwlayer_track_menu (VikWindow *vw, VikLayersPanel *vlp, Vi
   if ( filter_track == NULL )
     return NULL;
   else {
-    gchar *menu_title = g_strdup_printf ( "Filter with %s", filter_track->name );
+    gchar *menu_title = g_strdup_printf ( _("Filter with %s"), filter_track->name );
     GtkWidget *rv = acquire_build_menu ( vw, vlp, vvp, vtl, filter_track,
                        menu_title, VIK_DATASOURCE_INPUTTYPE_TRWLAYER_TRACK );
     g_free ( menu_title );
@@ -457,7 +460,7 @@ GtkWidget *a_acquire_trwlayer_track_menu (VikWindow *vw, VikLayersPanel *vlp, Vi
 
 GtkWidget *a_acquire_track_menu (VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp, VikTrack *tr)
 {
-  return acquire_build_menu ( vw, vlp, vvp, NULL, tr, "Filter", VIK_DATASOURCE_INPUTTYPE_TRACK );
+  return acquire_build_menu ( vw, vlp, vvp, NULL, tr, _("Filter"), VIK_DATASOURCE_INPUTTYPE_TRACK );
 }
 
 void a_acquire_set_filter_track ( VikTrack *tr )