1 files changed, 100 insertions, 2 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index a05486e8..ee64b05f 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -81,6 +81,7 @@ static struct GNUNET_GTK_MainWindowContext main_context;
 static UniqueApp *unique_app;
 #endif
 
+
 struct GNUNET_GTK_MainWindowContext *
 GNUNET_FS_GTK_get_main_context ()
 {
@@ -230,6 +231,8 @@ GNUNET_GTK_main_window_configure_event_cb (GtkWidget *main_window,
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {  
+  struct SearchLookup *sl;
+
   GNUNET_GTK_tray_icon_destroy ();
   if (fs != NULL)
   {
@@ -248,8 +251,37 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   GNUNET_FS_GTK_close_uri_tab_ ();
   if (NULL != ml)
+  {
     GNUNET_GTK_main_loop_quit (ml);
-  ml = NULL;
+    ml = NULL;
+  }
+  if (NULL != main_context.id_op)
+  {
+    GNUNET_IDENTITY_cancel (main_context.id_op);
+    main_context.id_op = NULL;
+  }
+  if (NULL != main_context.identity)
+  {
+    GNUNET_IDENTITY_disconnect (main_context.identity);
+    main_context.identity = NULL;
+  }
+  while (NULL != (sl = main_context.sl_head)) 
+    abort_search_lookup (sl);  
+  if (NULL != main_context.zm)
+  {
+    GNUNET_NAMESTORE_zone_monitor_stop (main_context.zm);
+    main_context.zm = NULL;
+  }
+  if (NULL != main_context.gns)
+  {
+    GNUNET_GNS_disconnect (main_context.gns);
+    main_context.gns = NULL;
+  }
+  if (NULL != main_context.sks_zone)
+  {
+    GNUNET_free (main_context.sks_zone);
+    main_context.sks_zone = NULL;
+  }
 }
 
 
@@ -408,6 +440,7 @@ unique_app_message_cb (UniqueApp *app,
 }
 #endif
 
+
 static char *
 format_service_list (unsigned int count, const char *const*list)
 {
@@ -514,6 +547,67 @@ service_status_change (void *cls,
 
 
 /**
+ * Process a record that was stored in the namestore in the
+ * "sks_zone".  Adds (or removes) the respective label to the
+ * drop-down menu for the SKS search by manipulating the
+ * "namespace_label_liststore".
+ *
+ * @param cls closure
+ * @param zone private key of the zone
+ * @param label label of the records
+ * @param rd_count number of entries in @a rd array
+ * @param rd array of records with data to store
+ */
+static void 
+monitor_zone_records (void *cls,
+                      const struct GNUNET_CRYPTO_EccPrivateKey *zone,
+                      const char *label,
+                      unsigned int rd_count,
+                      const struct GNUNET_NAMESTORE_RecordData *rd)
+{
+  GNUNET_break (0); // not implemented
+}
+
+
+/**
+ * The identity service has given us the ego we should use for resolving
+ * namepace names.
+ *
+ * @param cls closure
+ * @param ego ego handle, NULL for none
+ * @param ctx context for application to store data for this ego
+ *                 (during the lifetime of this process, initially NULL)
+ * @param name name assigned by the user for this ego,
+ *                   NULL if the user just deleted the ego and it
+ *                   must thus no longer be used
+ */
+static void
+handle_sks_zone_identity (void *cls,
+                          struct GNUNET_IDENTITY_Ego *ego,
+                          void **ctx,
+                          const char *name)
+{
+  main_context.id_op = NULL;
+  
+  if (NULL == ego)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  _("No default ego specified for `fs-sks` service, will not enable namespace search.\n"));
+      return;
+    }
+  main_context.sks_zone = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
+  *main_context.sks_zone = *GNUNET_IDENTITY_ego_get_private_key (ego);
+  gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_label")));
+  gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox")));
+  main_context.zm = GNUNET_NAMESTORE_zone_monitor_start (main_context.cfg,
+                                                         main_context.sks_zone,
+                                                         &monitor_zone_records,
+                                                         NULL, 
+                                                         NULL);
+}
+
+
+/**
  * Actual main function run right after GNUnet's scheduler
  * is initialized.  Initializes up GTK and Glade.
  *
@@ -635,7 +729,11 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   arm = GNUNET_ARM_connect (main_context.cfg, &arm_connection_state_change, &main_context);
   armon = GNUNET_ARM_monitor (main_context.cfg, service_status_change, &main_context);
-
+  main_context.identity = GNUNET_IDENTITY_connect (main_context.cfg, NULL, NULL);
+  main_context.id_op = GNUNET_IDENTITY_get (main_context.identity,
+                                            "fs-sks",
+                                            &handle_sks_zone_identity,
+                                            NULL);
   GNUNET_GTK_main_window_refresh_ns_list (&main_context);
 #if HAVE_LIBUNIQUE
   unique_app_watch_window (unique_app, GTK_WINDOW (main_context.main_window));