aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/fs/namespace.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/fs/namespace.c')
-rw-r--r--src/plugins/fs/namespace.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 4a849582..0449e3b0 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -35,6 +35,7 @@
35#include <GNUnet/gnunet_util_crypto.h> 35#include <GNUnet/gnunet_util_crypto.h>
36#include <GNUnet/gnunet_uritrack_lib.h> 36#include <GNUnet/gnunet_uritrack_lib.h>
37#include <GNUnet/gnunet_namespace_lib.h> 37#include <GNUnet/gnunet_namespace_lib.h>
38#include <GNUnet/gnunet_pseudonym_lib.h>
38#include <extractor.h> 39#include <extractor.h>
39 40
40/** 41/**
@@ -402,7 +403,6 @@ addNamespaceContentToModel (void *cls,
402 */ 403 */
403int 404int
404addTabForNamespace (void *unused, 405addTabForNamespace (void *unused,
405 const char *namespaceName,
406 const GNUNET_HashCode * namespaceId, 406 const GNUNET_HashCode * namespaceId,
407 const struct GNUNET_ECRS_MetaData *md, int rating) 407 const struct GNUNET_ECRS_MetaData *md, int rating)
408{ 408{
@@ -410,12 +410,14 @@ addTabForNamespace (void *unused,
410 GtkWidget *label; 410 GtkWidget *label;
411 GtkWidget *notebook; 411 GtkWidget *notebook;
412 GtkWidget *del_menu; 412 GtkWidget *del_menu;
413 char * namespaceName;
413 414
414 if (GNUNET_OK != 415 if (GNUNET_OK !=
415 GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceName, 416 GNUNET_ECRS_namespace_test_exists (NULL, cfg,
416 namespaceId)) 417 namespaceId))
417 return GNUNET_OK; 418 return GNUNET_OK;
418 GNUNET_GTK_DEBUG_BEGIN (); 419 GNUNET_GTK_DEBUG_BEGIN ();
420 namespaceName = GNUNET_PSEUDO_id_to_name(ectx, cfg, namespaceId);
419 label = gtk_label_new (namespaceName); 421 label = gtk_label_new (namespaceName);
420 list = GNUNET_malloc (sizeof (NamespaceList)); 422 list = GNUNET_malloc (sizeof (NamespaceList));
421 list->name = GNUNET_strdup (namespaceName); 423 list->name = GNUNET_strdup (namespaceName);
@@ -441,6 +443,7 @@ addTabForNamespace (void *unused,
441 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 443 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
442 "namespaceDelete"); 444 "namespaceDelete");
443 gtk_widget_set_sensitive (del_menu, TRUE); 445 gtk_widget_set_sensitive (del_menu, TRUE);
446 GNUNET_free(namespaceName);
444 return GNUNET_OK; 447 return GNUNET_OK;
445} 448}
446 449
@@ -990,9 +993,9 @@ fs_namespace_start ()
990 (GTK_TREE_VIEW (contentList), col - 1), 993 (GTK_TREE_VIEW (contentList), col - 1),
991 TRUE); 994 TRUE);
992 GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL); 995 GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
993 GNUNET_NS_namespace_list_all (ectx, cfg, &addTabForNamespace, NULL); 996 GNUNET_PSEUDO_list_all (ectx, cfg, &addTabForNamespace, NULL);
994 GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb, 997 GNUNET_PSEUDO_register_discovery_callback (ectx, cfg, &namespace_discovered_cb,
995 NULL); 998 NULL);
996 GNUNET_GTK_DEBUG_END (); 999 GNUNET_GTK_DEBUG_END ();
997} 1000}
998 1001
@@ -1000,7 +1003,7 @@ fs_namespace_start ()
1000void 1003void
1001fs_namespace_stop () 1004fs_namespace_stop ()
1002{ 1005{
1003 GNUNET_NS_unregister_discovery_callback (&namespace_discovered_cb, NULL); 1006 GNUNET_PSEUDO_unregister_discovery_callback (&namespace_discovered_cb, NULL);
1004 while (head != NULL) 1007 while (head != NULL)
1005 frame_destroy (head->treeview); 1008 frame_destroy (head->treeview);
1006 GNUNET_URITRACK_unregister_track_callback (&updateViewSave, NULL); 1009 GNUNET_URITRACK_unregister_track_callback (&updateViewSave, NULL);