Improve function comments as these don't return anything

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

diff --git a/src/viktrwlayer_wpwin.c b/src/viktrwlayer_wpwin.c
index 25f2e9939a2d194283f7eb7cb002ca6e602d9696..4ebfa2ad768b55f326fece625a926485ad5cb259 100644 (file)
--- a/src/viktrwlayer_wpwin.c
+++ b/src/viktrwlayer_wpwin.c
@@ -32,7 +32,6 @@
 #include "viking.h"
 #include "vikdatetime_edit_dialog.h"
 #include "vikgoto.h"
-#include "vikutils.h"
 
 static void update_time ( GtkWidget *widget, VikWaypoint *wp )
 {
@@ -112,6 +111,8 @@ gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikTrwLayer *
   struct LatLon ll;
   GtkWidget *latlabel, *lonlabel, *namelabel, *latentry, *lonentry, *altentry, *altlabel, *nameentry=NULL;
   GtkWidget *commentlabel, *commententry, *descriptionlabel, *descriptionentry, *imagelabel, *imageentry, *symbollabel, *symbolentry;
+  GtkWidget *sourcelabel = NULL, *sourceentry = NULL;
+  GtkWidget *typelabel = NULL, *typeentry = NULL;
   GtkWidget *timelabel = NULL;
   GtkWidget *timevaluebutton = NULL;
   GtkWidget *hasGeotagCB = NULL;
@@ -180,6 +181,18 @@ gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikTrwLayer *
     descriptionlabel = gtk_label_new (_("Description:"));
   descriptionentry = gtk_entry_new ();
 
+  sourcelabel = gtk_label_new (_("Source:"));
+  if ( wp->source ) {
+    sourceentry = gtk_entry_new ();
+    gtk_entry_set_text(GTK_ENTRY(sourceentry), wp->source);
+  }
+
+  typelabel = gtk_label_new (_("Type:"));
+  if ( wp->type ) {
+    typeentry = gtk_entry_new ();
+    gtk_entry_set_text(GTK_ENTRY(typeentry), wp->type);
+  }
+
   imagelabel = gtk_label_new (_("Image:"));
   imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN, VF_FILTER_IMAGE, NULL, NULL);
 
@@ -289,6 +302,14 @@ gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikTrwLayer *
   gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), commententry, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), descriptionlabel, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), descriptionentry, FALSE, FALSE, 0);
+  if ( wp->source ) {
+    gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), sourcelabel, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), sourceentry, FALSE, FALSE, 0);
+  }
+  if ( wp->type ) {
+    gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), typelabel, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), typeentry, FALSE, FALSE, 0);
+  }
   gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), imagelabel, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), imageentry, FALSE, FALSE, 0);
   if ( hasGeotagCB ) {
@@ -339,6 +360,10 @@ gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikTrwLayer *
         vik_waypoint_set_description ( wp, gtk_entry_get_text ( GTK_ENTRY(descriptionentry) ) );
       if ( g_strcmp0 ( wp->image, vik_file_entry_get_filename ( VIK_FILE_ENTRY(imageentry) ) ) )
         vik_waypoint_set_image ( wp, vik_file_entry_get_filename ( VIK_FILE_ENTRY(imageentry) ) );
+      if ( sourceentry && g_strcmp0 ( wp->source, gtk_entry_get_text ( GTK_ENTRY(sourceentry) ) ) )
+        vik_waypoint_set_source ( wp, gtk_entry_get_text ( GTK_ENTRY(sourceentry) ) );
+      if ( typeentry && g_strcmp0 ( wp->type, gtk_entry_get_text ( GTK_ENTRY(typeentry) ) ) )
+        vik_waypoint_set_type ( wp, gtk_entry_get_text ( GTK_ENTRY(typeentry) ) );
       if ( wp->image && *(wp->image) && (!a_thumbnails_exists(wp->image)) )
         a_thumbnails_create ( wp->image );
       if ( edit_wp->timestamp ) {