Add G_BEGIN_DECLS and G_END_DECLS to most header files.

[andy/viking.git] / src / vikwaypoint.h

diff --git a/src/vikwaypoint.h b/src/vikwaypoint.h
index 965cc651693767d40d91965d0ca8809e4ec52293..ecd2b36e5f87c6afec9901e3c1e35f9bd174ce34 100644 (file)
--- a/src/vikwaypoint.h
+++ b/src/vikwaypoint.h
@@ -22,6 +22,9 @@
 #ifndef _VIKING_WAYPOINT_H
 #define _VIKING_WAYPOINT_H
 
+#include "vikcoord.h"
+
+G_BEGIN_DECLS
 /* todo important: put these in their own header file, maybe.probably also rename */
 
 #define VIK_WAYPOINT(x) ((VikWaypoint *)(x))
@@ -32,21 +35,30 @@ struct _VikWaypoint {
   VikCoord coord;
   gboolean visible;
   gdouble altitude;
+  gchar *name;
   gchar *comment;
+  gchar *description;
   gchar *image;
   /* a rather misleading, ugly hack needed for trwlayer's click image.
    * these are the height at which the thumbnail is being drawn, not the 
    * dimensions of the original image. */
   guint8 image_width;
   guint8 image_height;
-  /* int symbol; */
+  gchar *symbol;
 };
 
 VikWaypoint *vik_waypoint_new();
+void vik_waypoint_set_name(VikWaypoint *wp, const gchar *name);
 void vik_waypoint_set_comment(VikWaypoint *wp, const gchar *comment);
+void vik_waypoint_set_description(VikWaypoint *wp, const gchar *description);
 void vik_waypoint_set_image(VikWaypoint *wp, const gchar *image);
+void vik_waypoint_set_symbol(VikWaypoint *wp, const gchar *symname);
 void vik_waypoint_free(VikWaypoint * wp);
 VikWaypoint *vik_waypoint_copy(const VikWaypoint *wp);
 void vik_waypoint_set_comment_no_copy(VikWaypoint *wp, gchar *comment);
+void vik_waypoint_marshall ( VikWaypoint *wp, guint8 **data, guint *len);
+VikWaypoint *vik_waypoint_unmarshall (guint8 *data, guint datalen);
+
+G_END_DECLS
 
 #endif