-expression cleanup

1 files changed, 11 insertions, 10 deletions

diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index 9348bfab..c9fed3b9 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -810,7 +810,7 @@ GNUNET_setup_gns_type_cellrenderercombo_edited_cb (GtkCellRendererCombo *combo,
     is_valid = GNUNET_YES;
     GNUNET_free_non_null (data);
   }
-  if (not_dummy_row == TRUE)
+  if (not_dummy_row)
   {
     /* Updating an existing record */
     gtk_tree_store_set(ts, &it,
@@ -978,7 +978,6 @@ GNUNET_setup_gns_value_cellrenderertext_edited_cb (GtkCellRendererText *renderer
        }
        GNUNET_free (old_value);
     }
-
     if (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (type,
                                                        new_text,
                                                        &data,
@@ -1022,12 +1021,14 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
     return;
 
   gtk_tree_model_get_iter_from_string(tm, &it, path);
-  gtk_tree_model_get(tm, &it, GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy, -1);
-  gtk_tree_model_get(tm, &it, GNS_TREESTORE_COL_NAME, &name, -1);
+  gtk_tree_model_get(tm, &it,
+                     GNS_TREESTORE_COL_NOT_DUMMY_ROW, &not_dummy, 
+                     GNS_TREESTORE_COL_NAME, &name, 
+                     -1);
 
-  if (not_dummy == FALSE)
+  if (! not_dummy)
   {
-    /* update name */
+    /* change dummy line to new name, then add new dummy */
     gtk_tree_store_set (ts, &it,
                         GNS_TREESTORE_COL_NAME, new_text,
                         GNS_TREESTORE_COL_NAME_IS_VISIBLE, TRUE,
@@ -1045,8 +1046,8 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
                                          GNS_TREESTORE_COL_NAME_IS_VISIBLE, TRUE,
                                          GNS_TREESTORE_COL_RECORD_TYPE, GNUNET_DNSPARSER_TYPE_A,
                                          GNS_TREESTORE_COL_NOT_DUMMY_ROW, FALSE,
-                                        GNS_TREESTORE_COL_IS_RECORD_ROW, FALSE,
-          -1);
+                                         GNS_TREESTORE_COL_IS_RECORD_ROW, FALSE,
+                                         -1);
     }
   }
   else
@@ -1054,7 +1055,7 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
     /* update name */
     gtk_tree_store_set (ts, &it, GNS_TREESTORE_COL_NAME, new_text, -1);
 
-    if (TRUE == gtk_tree_model_iter_children (tm, &child, &it))
+    if (gtk_tree_model_iter_children (tm, &child, &it))
     {
       do
       {
@@ -1063,7 +1064,7 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
                            -1);
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New text for `%s' is `%s'\n", path, new_text);
       }
-      while (TRUE == gtk_tree_model_iter_next (tm, &child));
+      while (gtk_tree_model_iter_next (tm, &child));
     }
 
     check_name_validity_and_commit (gtk_tree_model_get_string_from_iter(tm, &it), name);