1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 3e7108f1..603a4269 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -217,7 +217,7 @@ makeNamespaceFrame (NamespaceList * entry)
   renderer = gtk_cell_renderer_text_new ();
   col =
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
-                                                 -1, _("Last ID"), renderer,
+                                                 -1, _("Identifier"), renderer,
                                                  "text",
                                                  IN_NAMESPACE_LAST_STRING,
                                                  NULL);
@@ -230,7 +230,7 @@ makeNamespaceFrame (NamespaceList * entry)
   renderer = gtk_cell_renderer_text_new ();
   col =
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
-                                                 -1, _("Next ID"), renderer,
+                                                 -1, _("Next Identifier"), renderer,
                                                  "text",
                                                  IN_NAMESPACE_NEXT_STRING,
                                                  NULL);
@@ -325,8 +325,8 @@ addNamespaceContentToModel (void *cls,
                       IN_NAMESPACE_HSIZE, size_h,
                       IN_NAMESPACE_DESCRIPTION, desc,
                       IN_NAMESPACE_MIMETYPE, mime,
-                      IN_NAMESPACE_LAST_STRING, &lastId,
-                      IN_NAMESPACE_NEXT_STRING, &nextId,
+                      IN_NAMESPACE_LAST_STRING, lastId,
+                      IN_NAMESPACE_NEXT_STRING, nextId,
                       IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
                       IN_NAMESPACE_META,
                       GNUNET_meta_data_duplicate (fi->meta), -1);
@@ -655,7 +655,6 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GtkTreeIter iter;
   GtkTreeSelection *selection;
   IUC cls;
-  char *last;
   char *next;
   GtkWidget *nextEntryLine;
   GtkWidget *identifierLabel;
@@ -692,7 +691,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
     }
   gtk_tree_model_get (list->model,
                       &iter, IN_NAMESPACE_NEXT_STRING, &next, -1);
-  if ((last == NULL) || (next == NULL))
+  if (next == NULL)
     {
       GNUNET_GE_BREAK (NULL, 0);
       return;
@@ -715,6 +714,8 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 
   /* get data from update dialog */
   cls.nextId = gtk_entry_get_text (GTK_ENTRY (nextEntryLine));
+  if (cls.nextId == NULL)
+    cls.nextId = "";
   cls.anonymityLevel
     = getSpinButtonValue (metaXML, "namespaceUpdateAnonymitySpinButton");
 
@@ -725,7 +726,6 @@ CLEANUP:
   gtk_widget_destroy (dialog);
   UNREF (metaXML);
   metaXML = NULL;
-  free (last);
   free (next);
   GNUNET_GTK_DEBUG_END ();
 }