#include "vikcoord.h"
#include "vikwaypoint.h"
#include "globals.h"
+#include "garminsymbols.h"
#include <glib/gi18n.h>
VikWaypoint *vik_waypoint_new()
if ( wp->name )
g_free ( wp->name );
- if ( name && name[0] != '\0' )
- wp->name = g_strdup(name);
- else
- wp->name = NULL;
+ wp->name = g_strdup(name);
}
void vik_waypoint_set_comment_no_copy(VikWaypoint *wp, gchar *comment)
if ( wp->symbol )
g_free ( wp->symbol );
- if ( symname && symname[0] != '\0' )
+ // NB symbol_pixbuf is just a reference, so no need to free it
+
+ if ( symname && symname[0] != '\0' ) {
wp->symbol = g_strdup(symname);
- else
+ wp->symbol_pixbuf = a_get_wp_sym ( wp->symbol );
+ }
+ else {
wp->symbol = NULL;
+ wp->symbol_pixbuf = NULL;
+ }
}
void vik_waypoint_free(VikWaypoint *wp)