1 files changed, 10 insertions, 33 deletions

diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index 52970006..de031086 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -397,7 +397,7 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
         TREE_COL_NAME_IS_VISIBLE, FALSE,
         TREE_COL_RECORD_TYPE, type,
         TREE_COL_RECORD_TYPE_AS_STR, type_str,
-        TREE_COL_EXP_TIME_AS_STR, GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_get_forever()),
+        TREE_COL_EXP_TIME_AS_STR, EXPIRE_NEVER_STRING,
         TREE_COL_EXP_TIME, GNUNET_TIME_absolute_get_forever(),
         TREE_COL_EXP_TIME_IS_REL, FALSE,
         TREE_COL_IS_RECORD_ROW, GNUNET_YES,
@@ -761,20 +761,16 @@ GNUNET_GNS_GTK_main_treeview_popup_menu_cb (GtkWidget *widget,
                                             gpointer user_data)
 {  
   struct GNUNET_GNS_Context *gns = user_data;
-  GtkTreeView *tv;
   GtkTreeModel *tm;
   GtkTreeIter it;
   GtkMenu *popup;
   GtkTreeSelection * ts;
   int not_dummy;
 
-
-
-  tv = GTK_TREE_VIEW(gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_main_treeview"));
-  ts = gtk_tree_view_get_selection(tv);
+  ts = gtk_tree_view_get_selection(gns->tv);
   if (FALSE == gtk_tree_selection_get_selected (ts, &tm, &it))
     return TRUE;
-  gtk_tree_model_get(GTK_TREE_MODEL(gns->ts), &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
+  gtk_tree_model_get(gns->tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
   if (GNUNET_NO == not_dummy)
     return TRUE;
 
@@ -788,16 +784,13 @@ void set_relative_expiration_time (struct GNUNET_GNS_Context *gns, struct GNUNET
 {
   GtkTreeIter it;
   GtkTreeIter parent;
-  int not_dummy;
-  gboolean has_parent;
   GtkCellRendererText *renderer;
+  GtkTreeModel *tm;
+  GtkTreeSelection * ts = gtk_tree_view_get_selection(gns->tv);
+  gboolean has_parent;
   struct GNUNET_TIME_Absolute abstime;
-
   char *path;
-
-  GtkTreeView *tv = GTK_TREE_VIEW(gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_main_treeview"));
-  GtkTreeModel *tm;
-  GtkTreeSelection * ts = gtk_tree_view_get_selection(tv);
+  int not_dummy;
 
   gtk_tree_selection_get_selected (ts, &tm, &it);
   gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
@@ -819,7 +812,6 @@ void set_relative_expiration_time (struct GNUNET_GNS_Context *gns, struct GNUNET
                                                         path,
                                                         convert_time_to_string (abstime),
                                                         gns);
-
 }
 
 
@@ -865,10 +857,7 @@ GNUNET_GNS_GTK_main_treeview_button_press_popup_menu_cb (GtkWidget *widget, GdkE
   if (NULL == widget)
     return FALSE;
   if (event->type == GDK_BUTTON_PRESS  &&  event->button == 3)
-  {
     GNUNET_GNS_GTK_main_treeview_popup_menu_cb (widget, user_data);
-
-  }
   return FALSE;
 }
 
@@ -877,10 +866,7 @@ GNUNET_GNS_GTK_main_treeview_key_press_popup_menu_cb (GtkWidget *widget, GdkEven
 {
   /* Check for delete key */
   if ((event->type == GDK_KEY_PRESS) && (GDK_KEY_Delete == event->keyval))
-  {
     GNUNET_GNS_GTK_main_treeview_popup_menu_cb (widget, user_data);
-
-  }
   return FALSE;
 }
 
@@ -891,24 +877,18 @@ struct ZoneIteration_Context
   struct GNUNET_NAMESTORE_ZoneIterator * it;
 };
 
-
-
-
 void GNUNET_GNS_GTK_delete_popup_menu_delete_cb (GtkMenuItem *menuitem,
                                                  gpointer user_data)
 {
   struct GNUNET_GNS_Context *gns = user_data;
   GtkTreeIter it;
+  GtkTreeModel *tm;
+  GtkTreeSelection * ts;
   int not_dummy;
   char *path;
 
-
-  GtkTreeView *tv = GTK_TREE_VIEW(gtk_builder_get_object (gns->builder, "GNUNET_GNS_GTK_main_treeview"));
-  GtkTreeModel *tm;
-  GtkTreeSelection * ts = gtk_tree_view_get_selection(tv);
-
+  ts = gtk_tree_view_get_selection(gns->tv);
   gtk_tree_selection_get_selected (ts, &tm, &it);
-
   gtk_tree_model_get(tm, &it, TREE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
   if (GNUNET_NO == not_dummy)
     return; /* do not delete the dummy line */
@@ -996,8 +976,6 @@ void zone_iteration_proc (void *cls,
                         TREE_COL_NAME_COLOR, "red",
                         -1);
   }
-
-
   /* Append elements for records */
   for (c = 0; c < rd_count; c ++)
   {
@@ -1045,7 +1023,6 @@ void zone_iteration_proc (void *cls,
                                        TREE_COL_IS_RECORD_ROW, GNUNET_YES,
                                        TREE_COL_NOT_DUMMY_ROW, GNUNET_YES,
                                        -1);
-
     GNUNET_free (exp);
   }