-renaming and cleaning up pseudonym-creation code

2 files changed, 24 insertions, 19 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index d216ebce..4b975471 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -14,6 +14,7 @@ gnunet_fs_gtk_SOURCES = \
   gnunet-fs-gtk_about.c \
   gnunet-fs-gtk_anonymity-widgets.c gnunet-fs-gtk_anonymity-widgets.h \
   gnunet-fs-gtk_common.c gnunet-fs-gtk_common.h \
+  gnunet-fs-gtk_create-pseudonym.c \
   gnunet-fs-gtk_download-save-as.c gnunet-fs-gtk_download-save-as.h \
   gnunet-fs-gtk_event-handler.c gnunet-fs-gtk_event-handler.h \
   gnunet-fs-gtk_main-window-search.c \
@@ -22,7 +23,6 @@ gnunet_fs_gtk_SOURCES = \
   gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \
   gnunet-fs-gtk-main_window_meta_data_context_menu.c \
   gnunet-fs-gtk-main_window_adv_pseudonym.c \
-  gnunet-fs-gtk-main_window_create_pseudonym.c \
   gnunet-fs-gtk-main_window_file_download.c \
   gnunet-fs-gtk-main_window_namespace.c \
   gnunet-fs-gtk-main_window_open_directory.c 
diff --git a/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c b/src/fs/gnunet-fs-gtk_create-pseudonym.c
index 9232e775..650017ee 100644
--- a/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_create-pseudonym.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2005, 2006, 2010 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006, 2010, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -19,38 +19,41 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
+ * @file src/fs/gnunet-fs-gtk_create-pseudonym.c
  * @author Christian Grothoff
- *
+ * @brief code to handle the main menu action to create a pseudonym
  */
 #include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk.h"
 
+
+/**
+ * User completed the 'create pseudonym' dialog.  Run the desired action.
+ *
+ * @param dialog the dialog
+ * @param response_id '-5' on "OK"
+ * @param user_data the builder of the dialog
+ */
 void
 GNUNET_GTK_create_namespace_dialog_response_cb (GtkDialog * dialog,
                                                 gint response_id,
                                                 gpointer user_data)
 {
+  GtkBuilder *builder = GTK_BUILDER (user_data);
   const char *name;
   struct GNUNET_FS_Namespace *ns;
   GtkWidget *ad;
-  GtkBuilder *builder;
 
-  builder = GTK_BUILDER (user_data);
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_create_namespace_dialog"));
-
   if (response_id != -5)
   {
     gtk_widget_destroy (ad);
     g_object_unref (G_OBJECT (builder));
     return;
   }
-  name =
-      gtk_entry_get_text (GTK_ENTRY
-                          (gtk_builder_get_object
-                           (builder,
-                            "GNUNET_GTK_create_namespace_name_entry")));
+  name = gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (builder, 
+                                                                "GNUNET_GTK_create_namespace_name_entry")));
   /* FIXME: show busy dialog while doing key creation */
   if (NULL != name)
   {
@@ -61,27 +64,29 @@ GNUNET_GTK_create_namespace_dialog_response_cb (GtkDialog * dialog,
   g_object_unref (G_OBJECT (builder));
 }
 
+
 /**
+ * User selected "create pseudonym" in the menu of the main window.
+ *
+ * @param dummy the menu entry
+ * @param user_data the main dialog builder, unused
  */
 void
 GNUNET_GTK_main_menu_create_pseudonym_activate_cb (GtkWidget * dummy,
-                                                   gpointer data)
+                                                   gpointer user_data)
 {
   GtkWidget *ad;
   GtkWidget *toplevel;
   GtkBuilder *builder;
 
-  builder =
-      GNUNET_GTK_get_new_builder
-    ("gnunet_fs_gtk_create_namespace_dialog.glade", NULL);
-  if (builder == NULL)
+  builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_create_namespace_dialog.glade", NULL);
+  if (NULL == builder)
   {
     GNUNET_break (0);
     return;
   }
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_create_namespace_dialog"));
-
   toplevel = gtk_widget_get_toplevel (dummy);
   if (GTK_IS_WINDOW (toplevel))
     gtk_window_set_transient_for (GTK_WINDOW (ad), GTK_WINDOW (toplevel));
@@ -89,4 +94,4 @@ GNUNET_GTK_main_menu_create_pseudonym_activate_cb (GtkWidget * dummy,
 }
 
 
-/* end of gnunet-fs-gtk-main_window_create_pseudonym.c */
+/* end of gnunet-fs-gtk_create-pseudonym.c */