diff options
Diffstat (limited to 'src/fs/gnunet-fs-gtk_common.c')
-rw-r--r-- | src/fs/gnunet-fs-gtk_common.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c index dcfbfa9f..a35e3d1e 100644 --- a/src/fs/gnunet-fs-gtk_common.c +++ b/src/fs/gnunet-fs-gtk_common.c | |||
@@ -54,11 +54,11 @@ GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format, | |||
54 | return GNUNET_strdup (data); | 54 | return GNUNET_strdup (data); |
55 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 55 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
56 | _("Failed to validate supposedly utf-8 string `%s' of length %u, assuming it to be a C string\n"), | 56 | _("Failed to validate supposedly utf-8 string `%s' of length %u, assuming it to be a C string\n"), |
57 | data, | 57 | data, |
58 | (unsigned int) data_len); | 58 | (unsigned int) data_len); |
59 | format = EXTRACTOR_METAFORMAT_C_STRING; | 59 | format = EXTRACTOR_METAFORMAT_C_STRING; |
60 | /* fall-through */ | 60 | /* fall-through */ |
61 | case EXTRACTOR_METAFORMAT_C_STRING: | 61 | case EXTRACTOR_METAFORMAT_C_STRING: |
62 | if (data_len > 0) | 62 | if (data_len > 0) |
63 | { | 63 | { |
64 | /* There are no guarantees that data is NULL-terminated, AFAIU, | 64 | /* There are no guarantees that data is NULL-terminated, AFAIU, |
@@ -117,7 +117,7 @@ GNUNET_FS_GTK_add_meta_data_to_list_store (void *cls, const char *plugin_name, | |||
117 | GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_VALUE, | 117 | GNUNET_GTK_FS_MAIN_WINDOW_META_DATA_MC_META_VALUE, |
118 | data_to_insert, | 118 | data_to_insert, |
119 | -1); | 119 | -1); |
120 | GNUNET_free (data_to_insert); | 120 | GNUNET_free (data_to_insert); |
121 | return 0; | 121 | return 0; |
122 | } | 122 | } |
123 | 123 | ||
@@ -223,7 +223,7 @@ GNUNET_FS_GTK_mmap_and_scan (const char *filename, | |||
223 | * @return description of the result in utf-8, never NULL | 223 | * @return description of the result in utf-8, never NULL |
224 | */ | 224 | */ |
225 | char * | 225 | char * |
226 | GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta, | 226 | GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta, |
227 | int *is_a_dup) | 227 | int *is_a_dup) |
228 | { | 228 | { |
229 | char *desc; | 229 | char *desc; |
@@ -277,8 +277,8 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri, | |||
277 | GtkComboBox *ns_cb; | 277 | GtkComboBox *ns_cb; |
278 | GtkEntry *ns_entry; | 278 | GtkEntry *ns_entry; |
279 | struct GNUNET_CRYPTO_EccPublicSignKey want; | 279 | struct GNUNET_CRYPTO_EccPublicSignKey want; |
280 | 280 | ||
281 | 281 | ||
282 | if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)) | 282 | if (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)) |
283 | { | 283 | { |
284 | struct DownloadEntry *de; | 284 | struct DownloadEntry *de; |
@@ -291,7 +291,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri, | |||
291 | } | 291 | } |
292 | query_entry = GTK_ENTRY (GNUNET_FS_GTK_get_main_window_object ("main_window_search_entry")); | 292 | query_entry = GTK_ENTRY (GNUNET_FS_GTK_get_main_window_object ("main_window_search_entry")); |
293 | ns_cb = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox")); | 293 | ns_cb = GTK_COMBO_BOX (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox")); |
294 | ns_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (ns_cb))); | 294 | ns_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (ns_cb))); |
295 | if (GNUNET_FS_uri_test_sks (uri)) | 295 | if (GNUNET_FS_uri_test_sks (uri)) |
296 | { | 296 | { |
297 | /* select the namespace */ | 297 | /* select the namespace */ |
@@ -315,7 +315,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri, | |||
315 | query_string = GNUNET_FS_uri_sks_get_content_id (uri); | 315 | query_string = GNUNET_FS_uri_sks_get_content_id (uri); |
316 | gtk_entry_set_text (query_entry, | 316 | gtk_entry_set_text (query_entry, |
317 | query_string); | 317 | query_string); |
318 | GNUNET_free (query_string); | 318 | GNUNET_free (query_string); |
319 | } | 319 | } |
320 | return; | 320 | return; |
321 | } | 321 | } |
@@ -329,7 +329,7 @@ GNUNET_FS_GTK_handle_uri (const struct GNUNET_FS_Uri *uri, | |||
329 | 329 | ||
330 | query_string = GNUNET_FS_uri_ksk_to_string_fancy (uri); | 330 | query_string = GNUNET_FS_uri_ksk_to_string_fancy (uri); |
331 | gtk_entry_set_text (query_entry, | 331 | gtk_entry_set_text (query_entry, |
332 | query_string); | 332 | query_string); |
333 | GNUNET_free (query_string); | 333 | GNUNET_free (query_string); |
334 | } | 334 | } |
335 | return; | 335 | return; |
@@ -413,9 +413,9 @@ GNUNET_GTK_get_reference_from_iter (GtkTreeModel *model, GtkTreeIter *iter) | |||
413 | * FALSE if ran out of parents | 413 | * FALSE if ran out of parents |
414 | */ | 414 | */ |
415 | gboolean | 415 | gboolean |
416 | GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model, | 416 | GNUNET_GTK_tree_model_get_next_flat_iter (GtkTreeModel *model, |
417 | GtkTreeIter *iter, | 417 | GtkTreeIter *iter, |
418 | gboolean allow_children, | 418 | gboolean allow_children, |
419 | GtkTreeIter *next_iter) | 419 | GtkTreeIter *next_iter) |
420 | { | 420 | { |
421 | GtkTreeIter current_iter = *iter; | 421 | GtkTreeIter current_iter = *iter; |