1 files changed, 27 insertions, 44 deletions

diff --git a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
index 94829429..6c22aa7b 100644
--- a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
+++ b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
@@ -24,6 +24,7 @@
  * @brief operations to manage user's anonymity level selections
  */
 #include "gnunet-fs-gtk-common.h"
+#include "gnunet-fs-gtk-anonymity_spin_buttons.h"
 #include <gdk/gdk.h>
 
 /**
@@ -71,33 +72,34 @@ GNUNET_GTK_anonymity_spin_button_value_changed_cb (GtkWidget * w, gpointer data)
 }
 
 
-
+/**
+ * Obtain the numeric anonymity level selected by a GtkComboBox.
+ *
+ * @param builder builder for looking up widgets
+ * @param combo_name name of the GtkComboBox with the anonymity selection
+ * @param p_level where to store the anonymity level
+ * @return TRUE on success, FALSE on failure
+ */
 gboolean
 GNUNET_GTK_get_selected_anonymity_level (GtkBuilder * builder,
                                          gchar * combo_name, guint * p_level)
 {
   GtkComboBox *combo;
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  guint level;
 
   combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, combo_name));
   if (!combo)
     return FALSE;
-
-  if (!gtk_combo_box_get_active_iter (combo, &iter))
-    return FALSE;
-
-  model = gtk_combo_box_get_model (combo);
-  if (!model)
-    return FALSE;
-
-  gtk_tree_model_get (model, &iter, 1, &level, -1);
-  if (p_level)
-    *p_level = level;
-  return TRUE;
+  return GNUNET_GTK_get_selected_anonymity_combo_level (combo, p_level);
 }
 
+
+/**
+ * Obtain the numeric anonymity level selected by a GtkComboBox.
+ *
+ * @param combo the GtkComboBox with the anonymity selection
+ * @param p_level where to store the anonymity level
+ * @return TRUE on success, FALSE on failure
+ */
 gboolean
 GNUNET_GTK_get_selected_anonymity_combo_level (GtkComboBox *combo, guint *p_level)
 {
@@ -105,64 +107,44 @@ GNUNET_GTK_get_selected_anonymity_combo_level (GtkComboBox *combo, guint *p_leve
   GtkTreeModel *model;
   guint level;
 
-  if (!gtk_combo_box_get_active_iter (combo, &iter))
+  if (! gtk_combo_box_get_active_iter (combo, &iter))
     return FALSE;
-
   model = gtk_combo_box_get_model (combo);
   if (!model)
     return FALSE;
-
   gtk_tree_model_get (model, &iter, 1, &level, -1);
   if (p_level)
     *p_level = level;
   return TRUE;
 }
 
+
 gboolean
 GNUNET_GTK_select_anonymity_level (GtkBuilder * builder, gchar * combo_name,
                                    guint sel_level)
 {
   GtkComboBox *combo;
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  guint level;
-  gboolean go_on;
 
   combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, combo_name));
   if (!combo)
     return FALSE;
-
-  model = gtk_combo_box_get_model (combo);
-  if (!model)
-    return FALSE;
-
-  for (go_on = gtk_tree_model_get_iter_first (model, &iter); go_on;
-       go_on = gtk_tree_model_iter_next (model, &iter))
-  {
-    gtk_tree_model_get (model, &iter, 1, &level, -1);
-    if (level == sel_level)
-    {
-      gtk_combo_box_set_active_iter (combo, &iter);
-      return TRUE;
-    }
-  }
-  return FALSE;
+  return GNUNET_GTK_select_anonymity_combo_level (combo, sel_level);
 }
 
+
 gboolean
 GNUNET_GTK_select_anonymity_combo_level (GtkComboBox *combo, guint sel_level)
 {
   GtkTreeIter iter;
   GtkTreeModel *model;
   guint level;
-  gboolean go_on;
 
   model = gtk_combo_box_get_model (combo);
   if (!model)
     return FALSE;
-
-  for (go_on = gtk_tree_model_get_iter_first (model, &iter); go_on;
-       go_on = gtk_tree_model_iter_next (model, &iter))
+  if (! gtk_tree_model_get_iter_first (model, &iter))
+    return FALSE;
+  do
   {
     gtk_tree_model_get (model, &iter, 1, &level, -1);
     if (level == sel_level)
@@ -170,7 +152,8 @@ GNUNET_GTK_select_anonymity_combo_level (GtkComboBox *combo, guint sel_level)
       gtk_combo_box_set_active_iter (combo, &iter);
       return TRUE;
     }
-  }
+  } 
+  while (gtk_tree_model_iter_next (model, &iter));
   return FALSE;
 }