aboutsummaryrefslogtreecommitdiff
path: root/src/fs/gnunet-fs-gtk_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs/gnunet-fs-gtk_common.c')
-rw-r--r--src/fs/gnunet-fs-gtk_common.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index ebfccab0..6dd28887 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -60,7 +60,7 @@ GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
60 data, 60 data,
61 (unsigned int) data_len); 61 (unsigned int) data_len);
62 format = EXTRACTOR_METAFORMAT_C_STRING; 62 format = EXTRACTOR_METAFORMAT_C_STRING;
63 /* fall-through */ 63 /* fall-through */
64 case EXTRACTOR_METAFORMAT_C_STRING: 64 case EXTRACTOR_METAFORMAT_C_STRING:
65 if (data_len > 0) 65 if (data_len > 0)
66 { 66 {
@@ -294,8 +294,8 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
294 GtkEntry *query_entry; 294 GtkEntry *query_entry;
295 GtkComboBox *ns_cb; 295 GtkComboBox *ns_cb;
296 GtkEntry *ns_entry; 296 GtkEntry *ns_entry;
297 struct GNUNET_IDENTITY_PublicKey want; 297 struct GNUNET_CRYPTO_EcdsaPublicKey want;
298 298 struct GNUNET_IDENTITY_PublicKey pkey;
299 299
300 if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)) 300 if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri))
301 { 301 {
@@ -310,7 +310,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
310 query_entry = GTK_ENTRY ( 310 query_entry = GTK_ENTRY (
311 GNUNET_FS_GTK_get_main_window_object ("main_window_search_entry")); 311 GNUNET_FS_GTK_get_main_window_object ("main_window_search_entry"));
312 ns_cb = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ( 312 ns_cb = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object (
313 "main_window_search_namespace_combobox")); 313 "main_window_search_namespace_combobox"));
314 ns_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (ns_cb))); 314 ns_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (ns_cb)));
315 if (GNUNET_FS_uri_test_sks (uri)) 315 if (GNUNET_FS_uri_test_sks (uri))
316 { 316 {
@@ -320,10 +320,12 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri,
320 GNUNET_break (0); 320 GNUNET_break (0);
321 return; 321 return;
322 } 322 }
323 pkey.type = GNUNET_IDENTITY_TYPE_ECDSA;
324 pkey.ecdsa_key = want;
323 { 325 {
324 const char *ns_zkey; 326 const char *ns_zkey;
325 327
326 ns_zkey = GNUNET_GNSRECORD_pkey_to_zkey (&want); 328 ns_zkey = GNUNET_GNSRECORD_pkey_to_zkey (&pkey);
327 gtk_entry_set_text (ns_entry, ns_zkey); 329 gtk_entry_set_text (ns_entry, ns_zkey);
328 } 330 }
329 /* set search entry to the namespace identifier */ 331 /* set search entry to the namespace identifier */
@@ -373,7 +375,7 @@ GNUNET_GTK_get_iter_from_reference (GtkTreeRowReference *rr, GtkTreeIter *iter)
373 GtkTreeModel *model; 375 GtkTreeModel *model;
374 path = gtk_tree_row_reference_get_path (rr); 376 path = gtk_tree_row_reference_get_path (rr);
375 model = gtk_tree_row_reference_get_model (rr); 377 model = gtk_tree_row_reference_get_model (rr);
376 if (path != NULL && model != NULL) 378 if ((path != NULL) && (model != NULL))
377 { 379 {
378 if (gtk_tree_model_get_iter (model, iter, path)) 380 if (gtk_tree_model_get_iter (model, iter, path))
379 result = GNUNET_OK; 381 result = GNUNET_OK;
@@ -396,7 +398,7 @@ GtkTreeRowReference *
396GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, GtkTreeIter *iter) 398GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, GtkTreeIter *iter)
397{ 399{
398 GtkTreeRowReference *result = NULL; 400 GtkTreeRowReference *result = NULL;
399 if (iter != NULL && model != NULL) 401 if ((iter != NULL) && (model != NULL))
400 { 402 {
401 GtkTreePath *path = gtk_tree_model_get_path (model, iter); 403 GtkTreePath *path = gtk_tree_model_get_path (model, iter);
402 if (path != NULL) 404 if (path != NULL)
@@ -459,4 +461,5 @@ GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model,
459 return FALSE; 461 return FALSE;
460} 462}
461 463
464
462/* end of gnunet-fs-gtk-common.c */ 465/* end of gnunet-fs-gtk-common.c */