- more changes

2 files changed, 14 insertions, 2 deletions

diff --git a/contrib/gnunet_gns_gtk_main_window.glade b/contrib/gnunet_gns_gtk_main_window.glade
index 440bd3d8..17929559 100644
--- a/contrib/gnunet_gns_gtk_main_window.glade
+++ b/contrib/gnunet_gns_gtk_main_window.glade
@@ -234,10 +234,10 @@
                     <property name="sort_column_id">0</property>
                     <child>
                       <object class="GtkCellRendererText" id="GNUNET_GNS_GTK_name_cellrenderertext">
-                        <property name="editable">True</property>
                         <signal name="edited" handler="GNUNET_GNS_GTK_name_cellrenderertext_edited_cb" swapped="no"/>
                       </object>
                       <attributes>
+                        <attribute name="editable">9</attribute>
                         <attribute name="text">0</attribute>
                       </attributes>
                     </child>
@@ -275,6 +275,10 @@
                         <property name="text_column">1</property>
                         <signal name="changed" handler="GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb" swapped="no"/>
                       </object>
+                      <attributes>
+                        <attribute name="text">3</attribute>
+                        <attribute name="has-entry">2</attribute>
+                      </attributes>
                     </child>
                   </object>
                 </child>
@@ -345,6 +349,8 @@
       <column type="gchararray"/>
       <!-- column-name value_color -->
       <column type="gchararray"/>
+      <!-- column-name name_is_editable -->
+      <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkListStore" id="GNUNET_GNS_GTK_type_liststore">
diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index 1fcdef24..95e980e8 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -39,6 +39,7 @@ enum
   TREE_COL_EXP_TIME_AS_STR,
   TREE_COL_VAL_AS_STR,
   TREE_COL_VAL_COLOR,
+  TREE_COL_NAME_IS_EDITABLE,
 };
 
 /**
@@ -179,6 +180,7 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
     gtk_tree_store_insert_with_values (gns->ts, &it,NULL, 0,
         TREE_COL_NAME, _(NEW_RECORD_STR),
         TREE_COL_RECORD_TYPE, 1,
+        TREE_COL_NAME_IS_EDITABLE, 1,
         -1);
 #if 0
     gtk_tree_store_append(gns->ts, &it, NULL);
@@ -266,8 +268,10 @@ void zone_iteration_proc (void *cls,
 */
   gtk_tree_store_set(zc_ctx->gns->ts, &iter_name,
                      TREE_COL_NAME, name,
+                     TREE_COL_NAME_IS_EDITABLE, 1,
                      -1);
 
+
   /* Append elements for records */
   for (c = 0; c < rd_count; c ++)
   {
@@ -298,7 +302,8 @@ void zone_iteration_proc (void *cls,
 
     gtk_tree_store_insert_with_values(zc_ctx->gns->ts, &iter_record , &iter_name, 0,
                                        TREE_COL_NAME, "",
-                                       TREE_COL_RECORD_TYPE, 4,
+                                       TREE_COL_RECORD_TYPE, rd[c].record_type,
+                                       TREE_COL_EXP_TIME_AS_STR, GNUNET_NAMESTORE_number_to_typename(rd[c].record_type),
                                        TREE_COL_IS_PUBLIC, public,
                                        TREE_COL_EXP_TIME_AS_STR, exp,
                                        TREE_COL_EXP_TIME_IS_REL, time_is_relative,
@@ -331,6 +336,7 @@ GNUNET_GNS_GTK_main_treeview_realize_cb (GtkWidget *widget,
   gtk_tree_store_insert_with_values(gns->ts, &toplevel, NULL, 0,
                                      TREE_COL_NAME, _(NEW_RECORD_STR),
                                      TREE_COL_RECORD_TYPE, 1,
+                                     TREE_COL_NAME_IS_EDITABLE, 1,
                                      -1);
 
   zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));