-separating pseudonym/namespace glade files from master dialog

2 files changed, 71 insertions, 43 deletions

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 4b975471..9836b576 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_advertise-pseudonym.c \
   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 \
@@ -22,7 +23,6 @@ gnunet_fs_gtk_SOURCES = \
   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_meta_data_context_menu.c \
-  gnunet-fs-gtk-main_window_adv_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_adv_pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 41fb7e7f..b3355a48 100644
--- a/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-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,7 +19,7 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
+ * @file src/fs/gnunet-fs-gtk_advertise-pseudonym.c
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk_common.h"
@@ -33,6 +33,7 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget * widget,
                                                     GdkEvent * event,
                                                     gpointer user_Data)
 {
+  /* FIXME-LEAK: this doesn't destroy the dialog properly... */
   gtk_widget_hide (widget);
   return TRUE;
 }
@@ -52,36 +53,33 @@ add_to_list (void *cls, const char *name, const GNUNET_HashCode * id)
 {
   GtkListStore *ls = cls;
   GtkTreeIter iter;
-  gtk_list_store_insert_with_values (ls, &iter, -1, 0, name, 1,
-                                     GNUNET_FS_namespace_create
-                                     (GNUNET_FS_GTK_get_fs_handle (), name),
-                                     -1);
-}
-
-
-static void
-selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
-{
-  GtkTreeIter iter;
-  GtkWidget *ok_button;
-  GtkBuilder *builder;
-
-  builder = GTK_BUILDER (user_data);
 
-  ok_button =
-      GTK_WIDGET (gtk_builder_get_object
-                  (builder, "GNUNET_GTK_select_pseudonym_ok_button"));
-  if (TRUE == gtk_tree_selection_get_selected (ts, NULL, &iter))
-    gtk_widget_set_sensitive (ok_button, TRUE);
-  else
-    gtk_widget_set_sensitive (ok_button, FALSE);
+  gtk_list_store_insert_with_values (ls, &iter, -1, 
+                                     0,  name, 
+                                     1, GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), 
+                                                                    name),
+                                     -1);
 }
 
 
+/**
+ *
+ */
 struct NamespaceAdvertisementContext
 {
+  /**
+   *
+   */
   struct GNUNET_FS_Namespace *ns;
+
+  /**
+   *
+   */
   const char *root;
+
+  /**
+   *
+   */
   struct GNUNET_FS_FileInformation *fip;
 };
 
@@ -116,6 +114,9 @@ advertise_namespace (void *cls, struct GNUNET_FS_FileInformation *fi,
 }
 
 
+/**
+ *
+ */
 static void
 adv_pseudonym_edit_publish_dialog_cb (gpointer cls, 
                                       gint ret,
@@ -135,6 +136,9 @@ adv_pseudonym_edit_publish_dialog_cb (gpointer cls,
 }
 
 
+/**
+ *
+ */
 void
 GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
                                                 gint response_id,
@@ -210,22 +214,6 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
 }
 
 
-void
-GNUNET_GTK_select_pseudonym_dialog_realize_cb (GtkWidget * widget,
-                                               gpointer user_data)
-{
-  GtkTreeView *tv;
-  GtkTreeSelection *sel;
-  GtkBuilder *builder;
-
-  builder = GTK_BUILDER (user_data);
-
-  tv = GTK_TREE_VIEW (gtk_builder_get_object
-                      (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
-  sel = gtk_tree_view_get_selection (tv);
-  g_signal_connect (G_OBJECT (sel), "changed",
-                    G_CALLBACK (selection_changed_cb), user_data);
-}
 
 
 /**
@@ -241,7 +229,6 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
   GtkBuilder *builder;
 
   builder = GTK_BUILDER (data);
-
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_select_pseudonym_dialog"));
   ls = GTK_LIST_STORE (gtk_builder_get_object
@@ -255,4 +242,45 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
 }
 
 
-/* end of gnunet-fs-gtk-main_window_adv_pseudonym.c */
+/**
+ *
+ */
+static void
+selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
+{
+  GtkBuilder *builder = GTK_BUILDER (user_data);
+  GtkTreeIter iter;
+  GtkWidget *ok_button;
+
+  ok_button =
+      GTK_WIDGET (gtk_builder_get_object
+                  (builder, "GNUNET_GTK_select_pseudonym_ok_button"));
+  if (TRUE == gtk_tree_selection_get_selected (ts, NULL, &iter))
+    gtk_widget_set_sensitive (ok_button, TRUE);
+  else
+    gtk_widget_set_sensitive (ok_button, FALSE);
+}
+
+
+/**
+ *
+ */
+void
+GNUNET_GTK_select_pseudonym_dialog_realize_cb (GtkWidget * widget,
+                                               gpointer user_data)
+{
+  GtkTreeView *tv;
+  GtkTreeSelection *sel;
+  GtkBuilder *builder;
+
+  builder = GTK_BUILDER (user_data);
+
+  tv = GTK_TREE_VIEW (gtk_builder_get_object
+                      (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
+  sel = gtk_tree_view_get_selection (tv);
+  g_signal_connect (G_OBJECT (sel), "changed",
+                    G_CALLBACK (selection_changed_cb), user_data);
+}
+
+
+/* end of gnunet-fs-gtk_advertise-pseudonym.c */