From 63959706b8b3f9c64f2021b7f9fccb268caf54ba Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Mon, 30 Dec 2013 11:29:23 +0000 Subject: [PATCH] [QA] Add explicit missing field initializers. --- src/datasource_bfilter.c | 2 +- src/datasource_file.c | 6 ++++++ src/datasource_gps.c | 8 +++++++- src/datasource_osm.c | 6 ++++++ src/datasource_routing.c | 6 ++++++ src/globals.c | 22 +++++++++++----------- src/googlesearch.c | 2 +- src/gpx.c | 2 +- src/mapcache.c | 2 +- src/osm-traces.c | 4 ++-- src/terraservermapsource.c | 2 +- src/vikdemlayer.c | 4 ++-- src/vikgeoreflayer.c | 4 ++-- src/vikmapslayer.c | 4 ++-- src/vikrouting.c | 2 +- src/viktrwlayer.c | 16 ++++++++-------- src/vikwindow.c | 12 +++++++++--- 17 files changed, 67 insertions(+), 37 deletions(-) diff --git a/src/datasource_bfilter.c b/src/datasource_bfilter.c index e243deb9..e0437168 100644 --- a/src/datasource_bfilter.c +++ b/src/datasource_bfilter.c @@ -43,7 +43,7 @@ VikLayerParamScale simplify_params_scales[] = { }; VikLayerParam bfilter_simplify_params[] = { - { VIK_LAYER_NUM_TYPES, "numberofpoints", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Max number of points:"), VIK_LAYER_WIDGET_SPINBUTTON, simplify_params_scales, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, "numberofpoints", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Max number of points:"), VIK_LAYER_WIDGET_SPINBUTTON, simplify_params_scales, NULL, NULL, NULL, NULL, NULL }, }; VikLayerParamData bfilter_simplify_params_defaults[] = { diff --git a/src/datasource_file.c b/src/datasource_file.c index 27da820a..8feb0c91 100644 --- a/src/datasource_file.c +++ b/src/datasource_file.c @@ -73,6 +73,12 @@ VikDataSourceInterface vik_datasource_file_interface = { (VikDataSourceAddProgressWidgetsFunc) NULL, (VikDataSourceCleanupFunc) datasource_file_cleanup, (VikDataSourceOffFunc) NULL, + + NULL, + 0, + NULL, + NULL, + 0 }; /* See VikDataSourceInterface */ diff --git a/src/datasource_gps.c b/src/datasource_gps.c index aae81af8..c9933b60 100644 --- a/src/datasource_gps.c +++ b/src/datasource_gps.c @@ -66,7 +66,13 @@ VikDataSourceInterface vik_datasource_gps_interface = { (VikDataSourceProgressFunc) datasource_gps_progress, (VikDataSourceAddProgressWidgetsFunc) datasource_gps_add_progress_widgets, (VikDataSourceCleanupFunc) datasource_gps_cleanup, - (VikDataSourceOffFunc) datasource_gps_off + (VikDataSourceOffFunc) datasource_gps_off, + + NULL, + 0, + NULL, + NULL, + 0 }; /********************************************************* diff --git a/src/datasource_osm.c b/src/datasource_osm.c index d954a66e..05aa4bf9 100644 --- a/src/datasource_osm.c +++ b/src/datasource_osm.c @@ -65,6 +65,12 @@ VikDataSourceInterface vik_datasource_osm_interface = { (VikDataSourceAddProgressWidgetsFunc) NULL, (VikDataSourceCleanupFunc) datasource_osm_cleanup, (VikDataSourceOffFunc) NULL, + + NULL, + 0, + NULL, + NULL, + 0 }; static gpointer datasource_osm_init ( acq_vik_t *avt ) diff --git a/src/datasource_routing.c b/src/datasource_routing.c index c3cd2de4..4faf8beb 100644 --- a/src/datasource_routing.c +++ b/src/datasource_routing.c @@ -66,6 +66,12 @@ VikDataSourceInterface vik_datasource_routing_interface = { (VikDataSourceAddProgressWidgetsFunc) NULL, (VikDataSourceCleanupFunc) datasource_routing_cleanup, (VikDataSourceOffFunc) NULL, + + NULL, + 0, + NULL, + NULL, + 0 }; static gpointer datasource_routing_init ( acq_vik_t *avt ) diff --git a/src/globals.c b/src/globals.c index c06f4d3f..60cb2655 100644 --- a/src/globals.c +++ b/src/globals.c @@ -73,13 +73,13 @@ static VikLayerParamScale params_scales_long[] = { {-180.0, 180.0, 0.05, 2} }; static gchar * params_vik_fileref[] = {N_("Absolute"), N_("Relative"), NULL}; static VikLayerParam general_prefs[] = { - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "degree_format", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Degree format:"), VIK_LAYER_WIDGET_COMBOBOX, params_degree_formats, NULL, NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "units_distance", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Distance units:"), VIK_LAYER_WIDGET_COMBOBOX, params_units_distance, NULL, NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "units_speed", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Speed units:"), VIK_LAYER_WIDGET_COMBOBOX, params_units_speed, NULL, NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "units_height", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Height units:"), VIK_LAYER_WIDGET_COMBOBOX, params_units_height, NULL, NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "use_large_waypoint_icons", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, N_("Use large waypoint icons:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "default_latitude", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Default latitude:"), VIK_LAYER_WIDGET_SPINBUTTON, params_scales_lat, NULL, NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "default_longitude", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Default longitude:"), VIK_LAYER_WIDGET_SPINBUTTON, params_scales_long, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "degree_format", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Degree format:"), VIK_LAYER_WIDGET_COMBOBOX, params_degree_formats, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "units_distance", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Distance units:"), VIK_LAYER_WIDGET_COMBOBOX, params_units_distance, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "units_speed", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Speed units:"), VIK_LAYER_WIDGET_COMBOBOX, params_units_speed, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "units_height", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Height units:"), VIK_LAYER_WIDGET_COMBOBOX, params_units_height, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "use_large_waypoint_icons", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, N_("Use large waypoint icons:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "default_latitude", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Default latitude:"), VIK_LAYER_WIDGET_SPINBUTTON, params_scales_lat, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "default_longitude", VIK_LAYER_PARAM_DOUBLE, VIK_LAYER_GROUP_NONE, N_("Default longitude:"), VIK_LAYER_WIDGET_SPINBUTTON, params_scales_long, NULL, NULL, NULL, NULL, NULL }, }; /* External/Export Options */ @@ -97,13 +97,13 @@ static VikLayerParam io_prefs[] = { #ifndef WINDOWS static VikLayerParam io_prefs_non_windows[] = { - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_IO_NAMESPACE "image_viewer", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Image Viewer:"), VIK_LAYER_WIDGET_FILEENTRY, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_IO_NAMESPACE "image_viewer", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Image Viewer:"), VIK_LAYER_WIDGET_FILEENTRY, NULL, NULL, NULL, NULL, NULL, NULL }, }; #endif static VikLayerParam io_prefs_external_gpx[] = { - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_IO_NAMESPACE "external_gpx_1", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("External GPX Program 1:"), VIK_LAYER_WIDGET_FILEENTRY, NULL, NULL, NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_IO_NAMESPACE "external_gpx_2", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("External GPX Program 2:"), VIK_LAYER_WIDGET_FILEENTRY, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_IO_NAMESPACE "external_gpx_1", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("External GPX Program 1:"), VIK_LAYER_WIDGET_FILEENTRY, NULL, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_IO_NAMESPACE "external_gpx_2", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("External GPX Program 2:"), VIK_LAYER_WIDGET_FILEENTRY, NULL, NULL, NULL, NULL, NULL, NULL }, }; static VikLayerParamScale params_recent_files[] = { {-1, 25, 1, 0} }; @@ -111,7 +111,7 @@ static VikLayerParamScale params_recent_files[] = { {-1, 25, 1, 0} }; static VikLayerParam prefs_advanced[] = { { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_ADVANCED_NAMESPACE "save_file_reference_mode", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Save File Reference Mode:"), VIK_LAYER_WIDGET_COMBOBOX, params_vik_fileref, NULL, N_("When saving a Viking .vik file, this determines how the directory paths of filenames are written."), NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_ADVANCED_NAMESPACE "create_track_tooltip", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, N_("Show Tooltip during Track Creation:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_ADVANCED_NAMESPACE "create_track_tooltip", VIK_LAYER_PARAM_BOOLEAN, VIK_LAYER_GROUP_NONE, N_("Show Tooltip during Track Creation:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL, NULL, NULL, NULL, NULL }, { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_ADVANCED_NAMESPACE "number_recent_files", VIK_LAYER_PARAM_INT, VIK_LAYER_GROUP_NONE, N_("The number of recent files:"), VIK_LAYER_WIDGET_SPINBUTTON, params_recent_files, NULL, N_("Only applies to new windows or on application restart. -1 means all available files."), NULL, NULL, NULL }, }; diff --git a/src/googlesearch.c b/src/googlesearch.c index e8bf181c..cce2a829 100644 --- a/src/googlesearch.c +++ b/src/googlesearch.c @@ -45,7 +45,7 @@ #define GOOGLE_GOTO_PATTERN_2 ",lng:" #define GOOGLE_GOTO_NOT_FOUND "not understand the location" -static DownloadMapOptions googlesearch_options = { FALSE, FALSE, "http://maps.google.com/", 2, a_check_map_file, NULL }; +static DownloadMapOptions googlesearch_options = { FALSE, FALSE, "http://maps.google.com/", 2, a_check_map_file, NULL, NULL }; static void google_goto_tool_finalize ( GObject *gob ); diff --git a/src/gpx.c b/src/gpx.c index f42b8cc2..b05a1118 100644 --- a/src/gpx.c +++ b/src/gpx.c @@ -1094,7 +1094,7 @@ void a_gpx_write_file ( VikTrwLayer *vtl, FILE *f, GpxWritingOptions *options ) // so process each list separately GpxWritingContext context_tmp = context; - GpxWritingOptions opt_tmp = { FALSE, FALSE, FALSE }; + GpxWritingOptions opt_tmp = { FALSE, FALSE, FALSE, FALSE }; // Force trackpoints on tracks if ( !context.options ) context_tmp.options = &opt_tmp; diff --git a/src/mapcache.c b/src/mapcache.c index 5d520951..caab0f41 100644 --- a/src/mapcache.c +++ b/src/mapcache.c @@ -58,7 +58,7 @@ static VikLayerParamScale params_scales[] = { }; static VikLayerParam prefs[] = { - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "mapcache_size", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Map cache memory size (MB):"), VIK_LAYER_WIDGET_HSCALE, params_scales, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "mapcache_size", VIK_LAYER_PARAM_UINT, VIK_LAYER_GROUP_NONE, N_("Map cache memory size (MB):"), VIK_LAYER_WIDGET_HSCALE, params_scales, NULL, NULL, NULL, NULL, NULL }, }; void a_mapcache_init () diff --git a/src/osm-traces.c b/src/osm-traces.c index 8377083c..d0225356 100644 --- a/src/osm-traces.c +++ b/src/osm-traces.c @@ -94,8 +94,8 @@ typedef struct _OsmTracesInfo { } OsmTracesInfo; static VikLayerParam prefs[] = { - { VIK_LAYER_NUM_TYPES, VIKING_OSM_TRACES_PARAMS_NAMESPACE "username", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("OSM username:"), VIK_LAYER_WIDGET_ENTRY, NULL, NULL, NULL }, - { VIK_LAYER_NUM_TYPES, VIKING_OSM_TRACES_PARAMS_NAMESPACE "password", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("OSM password:"), VIK_LAYER_WIDGET_PASSWORD, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_OSM_TRACES_PARAMS_NAMESPACE "username", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("OSM username:"), VIK_LAYER_WIDGET_ENTRY, NULL, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_OSM_TRACES_PARAMS_NAMESPACE "password", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("OSM password:"), VIK_LAYER_WIDGET_PASSWORD, NULL, NULL, NULL, NULL, NULL, NULL }, }; /** diff --git a/src/terraservermapsource.c b/src/terraservermapsource.c index 72aec94a..5701a420 100644 --- a/src/terraservermapsource.c +++ b/src/terraservermapsource.c @@ -37,7 +37,7 @@ static gchar *_get_hostname( VikMapSourceDefault *self ); static DownloadMapOptions *_get_download_options( VikMapSourceDefault *self ); /* FIXME Huge gruik */ -static DownloadMapOptions terraserver_options = { FALSE, FALSE, NULL, 0, a_check_map_file, NULL }; +static DownloadMapOptions terraserver_options = { FALSE, FALSE, NULL, 0, a_check_map_file, NULL, NULL }; typedef struct _TerraserverMapSourcePrivate TerraserverMapSourcePrivate; struct _TerraserverMapSourcePrivate diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c index f1242a0d..432707aa 100644 --- a/src/vikdemlayer.c +++ b/src/vikdemlayer.c @@ -136,7 +136,7 @@ static VikToolInterface dem_tools[] = { (VikToolMouseFunc) dem_layer_download_click, NULL, (VikToolMouseFunc) dem_layer_download_release, (VikToolKeyFunc) NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_demdl_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_demdl_pixbuf, NULL }, }; @@ -950,7 +950,7 @@ static void srtm_dem_download_thread ( DEMDownloadParams *p, gpointer threaddata (intlon >= 0) ? 'E' : 'W', ABS(intlon) ); - static DownloadMapOptions options = { FALSE, FALSE, NULL, 0, a_check_map_file, NULL }; + static DownloadMapOptions options = { FALSE, FALSE, NULL, 0, a_check_map_file, NULL, NULL }; a_http_download_get_url ( SRTM_HTTP_SITE, src_fn, p->dest, &options, NULL ); g_free ( src_fn ); } diff --git a/src/vikgeoreflayer.c b/src/vikgeoreflayer.c index cffd692e..134e64e6 100644 --- a/src/vikgeoreflayer.c +++ b/src/vikgeoreflayer.c @@ -81,14 +81,14 @@ static VikToolInterface georef_tools[] = { (VikToolMouseFunc) georef_layer_move_press, NULL, (VikToolMouseFunc) georef_layer_move_release, (VikToolKeyFunc) NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_geomove_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_geomove_pixbuf, NULL }, { { "GeorefZoomTool", "vik-icon-Georef Zoom Tool", N_("Georef Z_oom Tool"), NULL, N_("Georef Zoom Tool"), 0 }, (VikToolConstructorFunc) georef_layer_zoom_create, NULL, NULL, NULL, (VikToolMouseFunc) georef_layer_zoom_press, NULL, NULL, (VikToolKeyFunc) NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_geozoom_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_geozoom_pixbuf, NULL }, }; VikLayerInterface vik_georef_layer_interface = { diff --git a/src/vikmapslayer.c b/src/vikmapslayer.c index ab7da473..e7db4127 100644 --- a/src/vikmapslayer.c +++ b/src/vikmapslayer.c @@ -180,7 +180,7 @@ static VikToolInterface maps_tools[] = { (VikToolMouseFunc) maps_layer_download_release, NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_mapdl_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_mapdl_pixbuf, NULL }, }; VikLayerInterface vik_maps_layer_interface = { @@ -275,7 +275,7 @@ enum { REDOWNLOAD_NONE = 0, /* download only missing maps */ DOWNLOAD_OR_REFRESH }; /* download missing maps and refresh cache */ static VikLayerParam prefs[] = { - { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "maplayer_default_dir", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Default map layer directory:"), VIK_LAYER_WIDGET_FOLDERENTRY, NULL, NULL, N_("Choose a directory to store cached Map tiles for this layer") }, + { VIK_LAYER_NUM_TYPES, VIKING_PREFERENCES_NAMESPACE "maplayer_default_dir", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Default map layer directory:"), VIK_LAYER_WIDGET_FOLDERENTRY, NULL, NULL, N_("Choose a directory to store cached Map tiles for this layer"), NULL, NULL, NULL }, }; void maps_layer_init () diff --git a/src/vikrouting.c b/src/vikrouting.c index c88f460a..9e66a24d 100644 --- a/src/vikrouting.c +++ b/src/vikrouting.c @@ -51,7 +51,7 @@ static GList *routing_engine_list = NULL; static VikLayerParam prefs[] = { - { VIK_LAYER_NUM_TYPES, VIKING_ROUTING_PARAMS_NAMESPACE "default", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Default engine:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, NULL, NULL, NULL, NULL }, + { VIK_LAYER_NUM_TYPES, VIKING_ROUTING_PARAMS_NAMESPACE "default", VIK_LAYER_PARAM_STRING, VIK_LAYER_GROUP_NONE, N_("Default engine:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, NULL, NULL, NULL, NULL, NULL }, }; gchar **routing_engine_labels = NULL; diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c index cbaba6c0..171eddea 100644 --- a/src/viktrwlayer.c +++ b/src/viktrwlayer.c @@ -418,7 +418,7 @@ static VikToolInterface trw_layer_tools[] = { (VikToolConstructorFunc) tool_new_waypoint_create, NULL, NULL, NULL, (VikToolMouseFunc) tool_new_waypoint_click, NULL, NULL, (VikToolKeyFunc) NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_addwp_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_addwp_pixbuf, NULL }, { { "CreateTrack", "vik-icon-Create Track", N_("Create _Track"), "T", N_("Create Track"), 0 }, (VikToolConstructorFunc) tool_new_track_create, NULL, NULL, NULL, @@ -427,7 +427,7 @@ static VikToolInterface trw_layer_tools[] = { (VikToolMouseFunc) tool_new_track_release, (VikToolKeyFunc) tool_new_track_key_press, TRUE, // Still need to handle clicks when in PAN mode to disable the potential trackpoint drawing - GDK_CURSOR_IS_PIXMAP, &cursor_addtr_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_addtr_pixbuf, NULL }, { { "CreateRoute", "vik-icon-Create Route", N_("Create _Route"), "B", N_("Create Route"), 0 }, (VikToolConstructorFunc) tool_new_route_create, NULL, NULL, NULL, @@ -436,7 +436,7 @@ static VikToolInterface trw_layer_tools[] = { (VikToolMouseFunc) tool_new_track_release, // -> Reuse these track methods on a route (VikToolKeyFunc) tool_new_track_key_press, // -/# TRUE, // Still need to handle clicks when in PAN mode to disable the potential trackpoint drawing - GDK_CURSOR_IS_PIXMAP, &cursor_new_route_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_new_route_pixbuf, NULL }, { { "EditWaypoint", "vik-icon-Edit Waypoint", N_("_Edit Waypoint"), "E", N_("Edit Waypoint"), 0 }, (VikToolConstructorFunc) tool_edit_waypoint_create, @@ -446,7 +446,7 @@ static VikToolInterface trw_layer_tools[] = { (VikToolMouseMoveFunc) tool_edit_waypoint_move, (VikToolMouseFunc) tool_edit_waypoint_release, (VikToolKeyFunc) NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_edwp_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_edwp_pixbuf, NULL }, { { "EditTrackpoint", "vik-icon-Edit Trackpoint", N_("Edit Trac_kpoint"), "K", N_("Edit Trackpoint"), 0 }, (VikToolConstructorFunc) tool_edit_trackpoint_create, @@ -456,19 +456,19 @@ static VikToolInterface trw_layer_tools[] = { (VikToolMouseMoveFunc) tool_edit_trackpoint_move, (VikToolMouseFunc) tool_edit_trackpoint_release, (VikToolKeyFunc) NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_edtr_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_edtr_pixbuf, NULL }, { { "ShowPicture", "vik-icon-Show Picture", N_("Show P_icture"), "I", N_("Show Picture"), 0 }, (VikToolConstructorFunc) tool_show_picture_create, NULL, NULL, NULL, (VikToolMouseFunc) tool_show_picture_click, NULL, NULL, (VikToolKeyFunc) NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_showpic_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_showpic_pixbuf, NULL }, { { "RouteFinder", "vik-icon-Route Finder", N_("Route _Finder"), "F", N_("Route Finder"), 0 }, (VikToolConstructorFunc) tool_route_finder_create, NULL, NULL, NULL, (VikToolMouseFunc) tool_route_finder_click, NULL, NULL, (VikToolKeyFunc) NULL, FALSE, - GDK_CURSOR_IS_PIXMAP, &cursor_route_finder_pixbuf }, + GDK_CURSOR_IS_PIXMAP, &cursor_route_finder_pixbuf, NULL }, }; enum { @@ -2802,7 +2802,7 @@ static const gchar* trw_layer_layer_tooltip ( VikTrwLayer *vtl ) // Safety check - I think these should always be valid if ( vtl->tracks && vtl->waypoints ) { - tooltip_tracks tt = { 0.0, 0, 0 }; + tooltip_tracks tt = { 0.0, 0, 0, 0 }; g_hash_table_foreach ( vtl->tracks, (GHFunc) trw_layer_tracks_tooltip, &tt ); GDate* gdate_start = g_date_new (); diff --git a/src/vikwindow.c b/src/vikwindow.c index 7bccefdd..67584618 100644 --- a/src/vikwindow.c +++ b/src/vikwindow.c @@ -1654,7 +1654,8 @@ static VikToolInterface ruler_tool = (VikToolKeyFunc) ruler_key_press, FALSE, GDK_CURSOR_IS_PIXMAP, - &cursor_ruler_pixbuf }; + &cursor_ruler_pixbuf, + NULL }; /*** end ruler code ********************************************************/ @@ -1926,7 +1927,8 @@ static VikToolInterface zoom_tool = NULL, FALSE, GDK_CURSOR_IS_PIXMAP, - &cursor_zoom_pixbuf }; + &cursor_zoom_pixbuf, + NULL }; /*** end zoom code ********************************************************/ /******************************************************************************** @@ -1989,7 +1991,9 @@ static VikToolInterface pan_tool = (VikToolMouseFunc) pantool_release, NULL, FALSE, - GDK_FLEUR }; + GDK_FLEUR, + NULL, + NULL }; /*** end pan code ********************************************************/ /******************************************************************************** @@ -3289,6 +3293,7 @@ static void default_location_cb ( GtkAction *a, VikWindow *vw ) NULL, NULL, NULL, + NULL, }, }; VikLayerParam pref_lon[] = { @@ -3303,6 +3308,7 @@ static void default_location_cb ( GtkAction *a, VikWindow *vw ) NULL, NULL, NULL, + NULL, }, }; -- 2.39.5