[GNUnet-SVN] r19642 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2012-02-02 18:04:50 +0100 (Thu, 02 Feb 2012)
New Revision: 19642

Added:
   gnunet-gtk/src/fs/gnunet-fs-gtk_create-pseudonym.c
Removed:
   gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
Modified:
   gnunet-gtk/src/fs/Makefile.am
Log:
-renaming and cleaning up pseudonym-creation code

Modified: gnunet-gtk/src/fs/Makefile.am
===================================================================
--- gnunet-gtk/src/fs/Makefile.am       2012-02-02 16:59:57 UTC (rev 19641)
+++ gnunet-gtk/src/fs/Makefile.am       2012-02-02 17:04:50 UTC (rev 19642)
@@ -14,6 +14,7 @@
   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_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 

Deleted: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c      
2012-02-02 16:59:57 UTC (rev 19641)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c      
2012-02-02 17:04:50 UTC (rev 19642)
@@ -1,92 +0,0 @@
-/*
-     This file is part of GNUnet
-     (C) 2005, 2006, 2010 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
-     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c
- * @author Christian Grothoff
- *
- */
-#include "gnunet-fs-gtk_common.h"
-#include "gnunet-fs-gtk.h"
-
-void
-GNUNET_GTK_create_namespace_dialog_response_cb (GtkDialog * dialog,
-                                                gint response_id,
-                                                gpointer 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")));
-  /* FIXME: show busy dialog while doing key creation */
-  if (NULL != name)
-  {
-    ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), name);
-    GNUNET_FS_namespace_delete (ns, GNUNET_NO);
-  }
-  gtk_widget_destroy (ad);
-  g_object_unref (G_OBJECT (builder));
-}
-
-/**
- */
-void
-GNUNET_GTK_main_menu_create_pseudonym_activate_cb (GtkWidget * dummy,
-                                                   gpointer data)
-{
-  GtkWidget *ad;
-  GtkWidget *toplevel;
-  GtkBuilder *builder;
-
-  builder =
-      GNUNET_GTK_get_new_builder
-    ("gnunet_fs_gtk_create_namespace_dialog.glade", NULL);
-  if (builder == NULL)
-  {
-    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));
-  gtk_window_present (GTK_WINDOW (ad));
-}
-
-
-/* end of gnunet-fs-gtk-main_window_create_pseudonym.c */

Copied: gnunet-gtk/src/fs/gnunet-fs-gtk_create-pseudonym.c (from rev 19630, 
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_create_pseudonym.c)
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_create-pseudonym.c                          
(rev 0)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_create-pseudonym.c  2012-02-02 17:04:50 UTC 
(rev 19642)
@@ -0,0 +1,97 @@
+/*
+     This file is part of GNUnet
+     (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
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @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;
+
+  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")));
+  /* FIXME: show busy dialog while doing key creation */
+  if (NULL != name)
+  {
+    ns = GNUNET_FS_namespace_create (GNUNET_FS_GTK_get_fs_handle (), name);
+    GNUNET_FS_namespace_delete (ns, GNUNET_NO);
+  }
+  gtk_widget_destroy (ad);
+  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 user_data)
+{
+  GtkWidget *ad;
+  GtkWidget *toplevel;
+  GtkBuilder *builder;
+
+  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));
+  gtk_window_present (GTK_WINDOW (ad));
+}
+
+
+/* end of gnunet-fs-gtk_create-pseudonym.c */