diff options
author | Christian Grothoff <christian@grothoff.org> | 2005-07-08 19:31:29 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2005-07-08 19:31:29 +0000 |
commit | f4ec0a23a415d6dfd3491f89e30d452632bb33a5 (patch) | |
tree | fcef6dee7e741704eff5daed1a1dd97c7df96472 | |
parent | e461eb85bd6562303f45ea41f8f1239f94ca2ac8 (diff) | |
download | gnunet-gtk-f4ec0a23a415d6dfd3491f89e30d452632bb33a5.tar.gz gnunet-gtk-f4ec0a23a415d6dfd3491f89e30d452632bb33a5.zip |
cleaning up APIs
-rw-r--r-- | src/plugins/fs/namespace.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c index c2062f4f..ab4fab5e 100644 --- a/src/plugins/fs/namespace.c +++ b/src/plugins/fs/namespace.c | |||
@@ -614,15 +614,14 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
614 | nameLine = glade_xml_get_widget(metaXML, | 614 | nameLine = glade_xml_get_widget(metaXML, |
615 | "namespaceNameEntry"); | 615 | "namespaceNameEntry"); |
616 | namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine)); | 616 | namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine)); |
617 | root = NULL; | 617 | root = FSUI_createNamespace(ctx, |
618 | if (OK == FSUI_createNamespace(ctx, | 618 | gtk_spin_button_get_value_as_int |
619 | gtk_spin_button_get_value_as_int | 619 | (GTK_SPIN_BUTTON(spin)), |
620 | (GTK_SPIN_BUTTON(spin)), | 620 | namespaceName, |
621 | namespaceName, | 621 | meta, |
622 | meta, | 622 | keywordURI, |
623 | keywordURI, | 623 | &rootEntry); |
624 | &rootEntry, | 624 | if (root != NULL) { |
625 | &root)) { | ||
626 | ECRS_getNamespaceId(root, | 625 | ECRS_getNamespaceId(root, |
627 | &namespaceId); | 626 | &namespaceId); |
628 | addTabForNamespace(NULL, | 627 | addTabForNamespace(NULL, |
@@ -630,6 +629,7 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
630 | &namespaceId, | 629 | &namespaceId, |
631 | meta, | 630 | meta, |
632 | 0); | 631 | 0); |
632 | ECRS_freeUri(root); | ||
633 | } else { | 633 | } else { |
634 | GtkWidget * dialog; | 634 | GtkWidget * dialog; |
635 | 635 | ||
@@ -646,7 +646,6 @@ void create_namespace_clicked(GtkWidget * dummy1, | |||
646 | gtk_dialog_run(GTK_DIALOG(dialog)); | 646 | gtk_dialog_run(GTK_DIALOG(dialog)); |
647 | gtk_widget_destroy(dialog); | 647 | gtk_widget_destroy(dialog); |
648 | } | 648 | } |
649 | ECRS_freeUri(root); | ||
650 | ECRS_freeMetaData(meta); | 649 | ECRS_freeMetaData(meta); |
651 | ECRS_freeUri(keywordURI); | 650 | ECRS_freeUri(keywordURI); |
652 | } | 651 | } |
@@ -768,16 +767,16 @@ static void initiateUpload(GtkTreeModel * model, | |||
768 | BREAK(); | 767 | BREAK(); |
769 | return; | 768 | return; |
770 | } | 769 | } |
771 | if (OK == FSUI_addToNamespace(ctx, | 770 | resultURI = FSUI_addToNamespace(ctx, |
772 | cls->anonymityLevel, | 771 | cls->anonymityLevel, |
773 | cls->namespaceName, | 772 | cls->namespaceName, |
774 | cls->updateInterval, | 773 | cls->updateInterval, |
775 | cls->lastId, | 774 | cls->lastId, |
776 | &cls->thisId, | 775 | &cls->thisId, |
777 | cls->nextId, | 776 | cls->nextId, |
778 | dst, | 777 | dst, |
779 | meta, | 778 | meta); |
780 | &resultURI)) { | 779 | if (resultURI != NULL) { |
781 | list = head; | 780 | list = head; |
782 | while ( (list != NULL) && | 781 | while ( (list != NULL) && |
783 | (0 != strcmp(cls->namespaceName, | 782 | (0 != strcmp(cls->namespaceName, |