-renaming and code simplification

3 files changed, 60 insertions, 28 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 95226157..2e19b9b6 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -21,11 +21,11 @@ gnunet_fs_gtk_SOURCES = \
   gnunet-fs-gtk_main-window-meta-data-context-menu.c \
   gnunet-fs-gtk_main-window-search.c \
   gnunet-fs-gtk_main-window-view-toggles.c \
+  gnunet-fs-gtk_open-directory.c \
   gnunet-fs-gtk_publish-dialog.c \
   gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \
   gnunet-fs-gtk-main_window_file_download.c \
-  gnunet-fs-gtk-main_window_namespace.c \
-  gnunet-fs-gtk-main_window_open_directory.c 
+  gnunet-fs-gtk-main_window_namespace.c 
 gnunet_fs_gtk_LDADD = \
   $(top_builddir)/src/lib/libgnunetgtk.la \
   @GTK_LIBS@ \
diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 09debe9b..07562f38 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -306,7 +306,11 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
   GtkBuilder *builder;
 
   builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_select_pseudonym_dialog.glade", NULL);
-
+  if (NULL == builder)
+  {
+    GNUNET_break (0);
+    return;
+  }
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_select_pseudonym_dialog"));
   ls = GTK_LIST_STORE (gtk_builder_get_object
diff --git a/src/fs/gnunet-fs-gtk-main_window_open_directory.c b/src/fs/gnunet-fs-gtk_open-directory.c
index cee0ff17..33ca2003 100644
--- a/src/fs/gnunet-fs-gtk-main_window_open_directory.c
+++ b/src/fs/gnunet-fs-gtk_open-directory.c
@@ -19,25 +19,44 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-main_window_open_directory.c
+ * @file src/fs/gnunet-fs-gtk_open-directory.c
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_event-handler.h"
 
+
+/**
+ * Closure for 'add_child' function.
+ */
 struct AddChildContext
 {
+  /**
+   * Name of the directory file.
+   */
   const char *filename;
+
+  /**
+   * Tree store where we will add entries.
+   */
   GtkTreeStore *ts;
+
+  /**
+   * Tab we've opened for the directory.
+   */
   struct SearchTab *tab;
-  struct SearchResult *par;
+
+  /**
+   * Row reference to the directorie's parent entry.
+   */
   GtkTreeRowReference *prr;
-  GtkTreeIter iter;
+
 };
 
 
 /**
- * Function used to process entries in a directory.
+ * Function used to process entries in a directory.  Adds each
+ * entry to our tab.
  *
  * @param cls closure, our 'struct AddChildContext*'
  * @param filename name of the file in the directory
@@ -57,57 +76,63 @@ add_child (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri,
            const void *data)
 {
   struct AddChildContext *acc = cls;
-  struct GNUNET_CONTAINER_MetaData *dmeta;
-  GtkTreePath *tp;
   GtkTreeIter iter;
 
-  if (uri == NULL)
+  if (NULL == uri)
   {
-    /* directory meta data itself */
+    /* directory meta data itself, create parent entry */
+    struct GNUNET_CONTAINER_MetaData *dmeta;
+    GtkTreePath *tp;
+
     dmeta = GNUNET_CONTAINER_meta_data_duplicate (meta);
     GNUNET_CONTAINER_meta_data_insert (dmeta, "<user>",
                                        EXTRACTOR_METATYPE_FILENAME,
                                        EXTRACTOR_METAFORMAT_UTF8, "text/plain",
                                        acc->filename,
                                        strlen (acc->filename) + 1);
-    acc->tab = GNUNET_GTK_add_to_uri_tab (&acc->iter, &acc->par, dmeta, NULL);
-    tp = gtk_tree_model_get_path (GTK_TREE_MODEL (acc->tab->ts), &acc->iter);
+    acc->tab = GNUNET_GTK_add_to_uri_tab (&iter, NULL, dmeta, NULL);
+    tp = gtk_tree_model_get_path (GTK_TREE_MODEL (acc->tab->ts), &iter);
     acc->prr = gtk_tree_row_reference_new (GTK_TREE_MODEL (acc->tab->ts), tp);
     gtk_tree_path_free (tp);
     acc->ts = acc->tab->ts;
     GNUNET_CONTAINER_meta_data_destroy (dmeta);
     return;
   }
-  if (acc->ts == NULL)
+  if (NULL == acc->ts)
+  {
+    GNUNET_break (0);
     return;
+  }
   GNUNET_assert (NULL !=
                  GNUNET_GTK_add_search_result (acc->tab, &iter, acc->prr, uri,
                                                meta, NULL, 0));
 }
 
+
+/**
+ * Function called from the open-directory dialog upon completion.
+ *
+ * @param dialog the pseudonym selection dialog
+ * @param response_id response code from the dialog
+ * @param user_data the builder of the dialog
+ */
 void
 GNUNET_GTK_open_directory_dialog_response_cb (GtkDialog * dialog,
                                               gint response_id,
                                               gpointer user_data)
 {
-  GtkBuilder *builder;
-  GtkWidget *ad;
+  GtkBuilder *builder = GTK_BUILDER (user_data);
   char *filename;
   struct AddChildContext acc;
 
-  builder = GTK_BUILDER (user_data);
-  ad = GTK_WIDGET (gtk_builder_get_object
-                   (builder, "GNUNET_GTK_open_directory_dialog"));
-
-  if (response_id != -5)
+  if (-5 != response_id)
   {
-    gtk_widget_destroy (ad);
+    gtk_widget_destroy (GTK_WIDGET (dialog));
     g_object_unref (G_OBJECT (builder));
     return;
   }
-
-  filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (ad));
-  gtk_widget_destroy (ad);
+  filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
   g_object_unref (G_OBJECT (builder));
   acc.filename = filename;
   acc.ts = NULL;
@@ -115,9 +140,13 @@ GNUNET_GTK_open_directory_dialog_response_cb (GtkDialog * dialog,
   g_free (filename);
 }
 
+
 /**
  * User selected "Open directory" in menu.  Display dialog, open
  * file and then display a new tab with its contents.
+ *
+ * @param dummy the menu entry
+ * @param user_data the main dialog builder, unused
  */
 void
 GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
@@ -128,10 +157,9 @@ GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
   GtkWidget *toplevel;
   GtkFileFilter *ff;
 
-
   builder =
     GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_open_directory_dialog.glade", NULL);
-  if (builder == NULL)
+  if (NULL == builder)
   {
     GNUNET_break (0);
     return;
@@ -149,4 +177,4 @@ GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb (GtkWidget * dummy,
   gtk_window_present (GTK_WINDOW (ad));
 }
 
-/* end of gnunet-fs-gtk-main_window_open_directory.c */
+/* end of gnunet-fs-gtk_open-directory.c */