#include "vikutils.h"
#endif
-#define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val)
static VikGpsLayer *vik_gps_layer_create (VikViewport *vp);
static void vik_gps_layer_realize ( VikGpsLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter );
static void vik_gps_layer_free ( VikGpsLayer *val );
static void gps_layer_change_coord_mode ( VikGpsLayer *val, VikCoordMode mode );
static void gps_layer_add_menu_items( VikGpsLayer *vtl, GtkMenu *menu, gpointer vlp );
-static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path );
static void gps_upload_cb( gpointer layer_and_vlp[2] );
static void gps_download_cb( gpointer layer_and_vlp[2] );
(VikLayerFuncSetParam) gps_layer_set_param,
(VikLayerFuncGetParam) gps_layer_get_param,
+ (VikLayerFuncChangeParam) NULL,
(VikLayerFuncReadFileData) NULL,
(VikLayerFuncWriteFileData) NULL,
(VikLayerFuncCopyItem) NULL,
(VikLayerFuncPasteItem) NULL,
(VikLayerFuncFreeCopiedItem) NULL,
- (VikLayerFuncDragDropRequest) gps_layer_drag_drop_request,
+ (VikLayerFuncDragDropRequest) NULL,
(VikLayerFuncSelectClick) NULL,
(VikLayerFuncSelectMove) NULL,
vik_layer_rename ( VIK_LAYER(rv), vik_gps_layer_interface.name );
for (i = 0; i < NUM_TRW; i++) {
- rv->trw_children[i] = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vp, NULL, FALSE ));
+ rv->trw_children[i] = VIK_TRW_LAYER(vik_layer_create ( VIK_LAYER_TRW, vp, FALSE ));
vik_layer_set_menu_items_selection(VIK_LAYER(rv->trw_children[i]), VIK_MENU_ITEM_ALL & ~(VIK_MENU_ITEM_CUT|VIK_MENU_ITEM_DELETE));
}
return rv;
child_layer = vik_layer_unmarshall ( data + sizeof(gint), alm_size, vvp );
if (child_layer) {
rv->trw_children[i++] = (VikTrwLayer *)child_layer;
- g_signal_connect_swapped ( G_OBJECT(child_layer), "update", G_CALLBACK(vik_layer_emit_update_secondary), rv );
+ // NB no need to attach signal update handler here
+ // as this will always be performed later on in vik_gps_layer_realize()
}
alm_next;
}
break;
case PARAM_GPSD_PORT:
if (data.s) {
- if (vgl->gpsd_port);
- g_free(vgl->gpsd_port);
+ if (vgl->gpsd_port)
+ g_free(vgl->gpsd_port);
vgl->gpsd_port = g_strdup(data.s);
}
break;
static void disconnect_layer_signal ( VikLayer *vl, VikGpsLayer *vgl )
{
- guint number_handlers = DISCONNECT_UPDATE_SIGNAL(vl,vgl);
+ guint number_handlers = g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, vgl);
if ( number_handlers != 1 ) {
- /*
- NB It's not fatal if this gives 2 for example! Hence removal of the g_assert
- This happens when copied GPS layer is deleted (not sure why the number_handlers would be 2)
- I don't think there's any side effects and certainly better than the program just aborting
- */
- g_warning(_("Unexpected number of disconnected handlers: %d"), number_handlers);
+ g_critical(_("Unexpected number of disconnected handlers: %d"), number_handlers);
}
}
#endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */
}
-gboolean vik_gps_layer_delete ( VikGpsLayer *vgl, GtkTreeIter *iter )
-{
- gint i;
- VikLayer *l = VIK_LAYER( vik_treeview_item_get_pointer ( VIK_LAYER(vgl)->vt, iter ) );
- gboolean was_visible = l->visible;
-
- vik_treeview_item_delete ( VIK_LAYER(vgl)->vt, iter );
- for (i = 0; i < NUM_TRW; i++) {
- if (VIK_LAYER(vgl->trw_children[i]) == l)
- vgl->trw_children[i] = NULL;
- }
- g_assert(DISCONNECT_UPDATE_SIGNAL(l,vgl)==1);
- g_object_unref ( l );
-
- return was_visible;
-}
-
static void vik_gps_layer_realize ( VikGpsLayer *vgl, VikTreeview *vt, GtkTreeIter *layer_iter )
{
GtkTreeIter iter;
return TRUE;
}
-static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path )
-{
- VikTreeview *vt = VIK_LAYER(val_src)->vt;
- VikLayer *vl = vik_treeview_item_get_pointer(vt, src_item_iter);
- gchar *dp;
-
- dp = gtk_tree_path_to_string(dest_path);
-
- /* vik_gps_layer_delete unrefs, but we don't want that here.
- * we're still using the layer. */
- g_object_ref ( vl );
- vik_gps_layer_delete(val_src, src_item_iter);
-
- g_free(dp);
-}
-
static void gps_session_delete(GpsSession *sess)
{
/* TODO */
if ((vgl->vehicle_position == VEHICLE_POSITION_CENTERED) ||
(vgl->realtime_jump_to_start && vgl->first_realtime_trackpoint)) {
- vik_viewport_set_center_coord(vvp, &vehicle_coord);
+ vik_viewport_set_center_coord(vvp, &vehicle_coord, FALSE);
update_all = TRUE;
}
else if (vgl->vehicle_position == VEHICLE_POSITION_ON_SCREEN) {