aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/fs/collection.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/fs/collection.c')
-rw-r--r--src/plugins/fs/collection.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index bcb8dcd6..2f8ecf64 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -65,10 +65,8 @@ on_collectionMetaDataValueEntry_activate_fs (GtkWidget *
65void 65void
66createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2) 66createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
67{ 67{
68 const char *collectionName;
69 const char *updateIntervalString; 68 const char *updateIntervalString;
70 GtkWidget *w; 69 GtkWidget *w;
71 GtkWidget *nameLine;
72 GtkWidget *dialog; 70 GtkWidget *dialog;
73 GtkWidget *spin; 71 GtkWidget *spin;
74 struct GNUNET_ECRS_MetaData *meta; 72 struct GNUNET_ECRS_MetaData *meta;
@@ -110,12 +108,9 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
110 meta = getMetaDataFromList (metaXML, 108 meta = getMetaDataFromList (metaXML,
111 "collectionMetaDataTreeView", NULL); 109 "collectionMetaDataTreeView", NULL);
112 spin = glade_xml_get_widget (metaXML, "collectionAnonymityLevel"); 110 spin = glade_xml_get_widget (metaXML, "collectionAnonymityLevel");
113 nameLine = glade_xml_get_widget (metaXML, "collectionIdentifierEntry");
114 collectionName = gtk_entry_get_text (GTK_ENTRY (nameLine));
115 root = NULL; 111 root = NULL;
116 if (GNUNET_OK == GNUNET_CO_collection_start (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000, /* priority */ 112 if (GNUNET_OK == GNUNET_CO_collection_start (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000, /* priority */
117 updateInterval, 113 updateInterval, meta))
118 collectionName, meta))
119 { 114 {
120 w = 115 w =
121 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 116 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
@@ -123,7 +118,7 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
123 gtk_widget_set_sensitive (w, FALSE); 118 gtk_widget_set_sensitive (w, FALSE);
124 w = 119 w =
125 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 120 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
126 "deleteCollection"); 121 "deleteCollection");
127 gtk_widget_set_sensitive (w, TRUE); 122 gtk_widget_set_sensitive (w, TRUE);
128 } 123 }
129 else 124 else
@@ -135,8 +130,7 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
135 GTK_DIALOG_MODAL, 130 GTK_DIALOG_MODAL,
136 GTK_MESSAGE_ERROR, 131 GTK_MESSAGE_ERROR,
137 GTK_BUTTONS_CLOSE, 132 GTK_BUTTONS_CLOSE,
138 _("Failed to start collection `%s' (consult logs)."), 133 _("Failed to start collection (consult logs)."));
139 collectionName);
140 gtk_dialog_run (GTK_DIALOG (dialog)); 134 gtk_dialog_run (GTK_DIALOG (dialog));
141 gtk_widget_destroy (dialog); 135 gtk_widget_destroy (dialog);
142 } 136 }
@@ -176,15 +170,15 @@ void
176fs_collection_start () 170fs_collection_start ()
177{ 171{
178 GtkWidget *w; 172 GtkWidget *w;
179 char *h; 173 struct GNUNET_ECRS_MetaData *h;
180 174
181 h = GNUNET_CO_collection_get_name (); 175 h = GNUNET_CO_collection_get_name ();
182 if (NULL != h) 176 if (NULL != h)
183 { 177 {
184 w = 178 w =
185 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), 179 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
186 "createCollection"); 180 "createCollection");
187 GNUNET_free (h); 181 GNUNET_ECRS_meta_data_destroy (h);
188 } 182 }
189 else 183 else
190 w = 184 w =