1 files changed, 23 insertions, 6 deletions

diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index cc306e67..147d8cef 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -43,7 +43,8 @@ enum TREESTORE_COLUMNS
   TREE_COL_NAME_IS_VISIBLE,
   TREE_COL_IS_RECORD_ROW,
   TREE_COL_NOT_DUMMY_ROW,
-  TREE_COL_EXP_TIME_COLOR
+  TREE_COL_EXP_TIME_COLOR,
+  TREE_COL_NAME_COLOR
 };
 
 enum LIST_COLUMNS
@@ -153,7 +154,9 @@ check_name_validity_and_commit (struct GNUNET_GNS_Context *gns, gchar *path)
 
     /* valid name */
     if (NULL == n_name)
-        valid = GNUNET_NO;
+      valid = GNUNET_NO;
+    else if (GNUNET_SYSERR == GNUNET_NAMESTORE_check_name (n_value))
+      valid = GNUNET_NO;
 
     /* valid record type */
     if (0 == n_type)
@@ -224,16 +227,16 @@ check_name_validity_and_remove_proc (void *cls,
   if (GNUNET_SYSERR == success)
   {
     char * message = _("Record could not be deleted:");
-    dialog = gtk_message_dialog_new (GTK_WINDOW (rcc->gns->main_window),
+    dialog = GTK_DIALOG(gtk_message_dialog_new (GTK_WINDOW (rcc->gns->main_window),
                                      GTK_DIALOG_DESTROY_WITH_PARENT,
                                      GTK_MESSAGE_ERROR,
                                      GTK_BUTTONS_CLOSE,
                                      _("%s\n%s\n"),
                                      message,
-                                     emsg);
+                                     emsg));
 
     g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), rcc->gns);
-    gtk_widget_show_all (dialog);
+    gtk_widget_show_all (GTK_WIDGET(dialog));
   }
   else
   {
@@ -318,7 +321,7 @@ check_name_validity_and_remove (struct GNUNET_GNS_Context *gns, gchar *path)
       rcc->gns = gns;
       rcc->path = strdup (path);
       GNUNET_NAMESTORE_record_remove(gns->ns, gns->pkey, name, &rd, &check_name_validity_and_remove_proc, rcc);
-      GNUNET_free (rd.data);
+      GNUNET_free ((void *) rd.data);
     }
     g_free (n_name);
     g_free (n_exp_color);
@@ -621,6 +624,20 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
     /* update name */
     gtk_tree_store_set (gns->ts, &it, TREE_COL_NAME, new_text, -1);
   }
+
+  if (GNUNET_SYSERR == GNUNET_NAMESTORE_check_name (new_text))
+  {
+    gtk_tree_store_set (gns->ts, &it,
+                        TREE_COL_NAME_COLOR, "red",
+                        -1);
+  }
+  else
+  {
+    gtk_tree_store_set (gns->ts, &it,
+                        TREE_COL_NAME_COLOR, NULL,
+                        -1);
+  }
+
   check_name_validity_and_commit (gns, path);
 }