- cleanup

1 files changed, 8 insertions, 10 deletions

diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index de031086..cbcbfaa8 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -362,7 +362,6 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
   struct GNUNET_GNS_Context *gns = user_data;
   GtkTreeIter it;
   GtkTreeIter child;
-  GtkTreeModel *tm = GTK_TREE_MODEL(gns->ts);
   guint type;
   int record_row;
   char *type_str;
@@ -371,14 +370,14 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
   void *data;
   size_t data_size;
 
-  gtk_tree_model_get(GTK_TREE_MODEL(gns->ls), new_iter, 0, &type, -1);
-  gtk_tree_model_get(GTK_TREE_MODEL(gns->ls), new_iter, TYPE_LIST_TYPENAME, &type_str, -1);
+  gtk_tree_model_get(gns->tm, new_iter, 0, &type, -1);
+  gtk_tree_model_get(gns->tm, new_iter, TYPE_LIST_TYPENAME, &type_str, -1);
 
 
   /* check if this is a new record */
-  gtk_tree_model_get_iter_from_string(tm, &it, path);
-  gtk_tree_model_get(tm, &it, TREE_COL_IS_RECORD_ROW, &record_row, -1);
-  gtk_tree_model_get(tm, &it, TREE_COL_NAME, &name_str, -1);
+  gtk_tree_model_get_iter_from_string(gns->tm, &it, path);
+  gtk_tree_model_get(gns->tm, &it, TREE_COL_IS_RECORD_ROW, &record_row, -1);
+  gtk_tree_model_get(gns->tm, &it, TREE_COL_NAME, &name_str, -1);
 
   if (GNUNET_YES == record_row)
   {
@@ -411,7 +410,7 @@ GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb (GtkCellRendererCombo *combo,
 
 
   /* check if value is still valid */
-  gtk_tree_model_get(tm, &it, TREE_COL_VAL_AS_STR, &value_str, -1);
+  gtk_tree_model_get(gns->tm, &it, TREE_COL_VAL_AS_STR, &value_str, -1);
   if (NULL != value_str)
   {
     if (GNUNET_OK != GNUNET_NAMESTORE_string_to_value (type,
@@ -451,11 +450,10 @@ GNUNET_GNS_GTK_ispublic_cellrenderertoggle_toggled_cb (GtkCellRendererToggle *ce
 {
   struct GNUNET_GNS_Context *gns = user_data;
   GtkTreeIter it;
-  GtkTreeModel *tm = GTK_TREE_MODEL(gns->ts);
   gboolean value;
 
-  gtk_tree_model_get_iter_from_string(tm, &it, path);
-  gtk_tree_model_get(tm, &it, TREE_COL_IS_PUBLIC, &value, -1);
+  gtk_tree_model_get_iter_from_string(gns->tm, &it, path);
+  gtk_tree_model_get(gns->tm, &it, TREE_COL_IS_PUBLIC, &value, -1);
   gtk_tree_store_set(gns->ts, &it, TREE_COL_IS_PUBLIC, !value, -1);
 
   check_name_validity_and_commit (gns, path);