aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2008-06-04 05:56:31 +0000
committerChristian Grothoff <christian@grothoff.org>2008-06-04 05:56:31 +0000
commitd2e17c575773ebbda91111fdc856be185eaa4ffd (patch)
treef314a08b3f354bd7efa703f9582a54d330cc1674
parent9aed3eb454729ca8272ec690036954c05f7d9a73 (diff)
downloadgnunet-gtk-d2e17c575773ebbda91111fdc856be185eaa4ffd.tar.gz
gnunet-gtk-d2e17c575773ebbda91111fdc856be185eaa4ffd.zip
re-indenting
Diffstat
-rw-r--r--src/plugins/chat/chat.c4
-rw-r--r--src/plugins/fs/content_tracking.c20
-rw-r--r--src/plugins/fs/download.c10
-rw-r--r--src/plugins/fs/extensions/musicinsert.c35
-rw-r--r--src/plugins/fs/fs.c2
-rw-r--r--src/plugins/fs/meta.c34
-rw-r--r--src/plugins/fs/meta.h4
-rw-r--r--src/plugins/fs/namespace.c37
-rw-r--r--src/plugins/fs/namespace_search.c24
-rw-r--r--src/plugins/fs/namespace_search.h3
-rw-r--r--src/plugins/fs/search.c2
-rw-r--r--src/plugins/fs/upload.c18
-rw-r--r--src/plugins/fs/upload.h3
13 files changed, 91 insertions, 105 deletions
diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index 2e352bb7..a7e8c038 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -187,8 +187,8 @@ receive_callback (void *cls,
187 187
188 sndr = 188 sndr =
189 sender == NULL ? _("anonymous") : GNUNET_pseudonym_id_to_name (chat_ectx, 189 sender == NULL ? _("anonymous") : GNUNET_pseudonym_id_to_name (chat_ectx,
190 chat_cfg, 190 chat_cfg,
191 sender); 191 sender);
192 writearg.text_view = client->text_view; 192 writearg.text_view = client->text_view;
193 writearg.message = message; 193 writearg.message = message;
194 writearg.sender = sndr; 194 writearg.sender = sndr;
diff --git a/src/plugins/fs/content_tracking.c b/src/plugins/fs/content_tracking.c
index 2a89c65e..29749909 100644
--- a/src/plugins/fs/content_tracking.c
+++ b/src/plugins/fs/content_tracking.c
@@ -122,16 +122,16 @@ updateView (void *cls)
122 "availableContentList"); 122 "availableContentList");
123 model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList)); 123 model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
124 filename = GNUNET_meta_data_get_first_by_types (fi->meta, 124 filename = GNUNET_meta_data_get_first_by_types (fi->meta,
125 EXTRACTOR_FILENAME, 125 EXTRACTOR_FILENAME,
126 EXTRACTOR_TITLE, 126 EXTRACTOR_TITLE,
127 EXTRACTOR_DESCRIPTION, 127 EXTRACTOR_DESCRIPTION,
128 EXTRACTOR_SUBJECT, 128 EXTRACTOR_SUBJECT,
129 EXTRACTOR_ARTIST, 129 EXTRACTOR_ARTIST,
130 EXTRACTOR_AUTHOR, 130 EXTRACTOR_AUTHOR,
131 EXTRACTOR_PUBLISHER, 131 EXTRACTOR_PUBLISHER,
132 EXTRACTOR_CREATOR, 132 EXTRACTOR_CREATOR,
133 EXTRACTOR_PRODUCER, 133 EXTRACTOR_PRODUCER,
134 EXTRACTOR_UNKNOWN, -1); 134 EXTRACTOR_UNKNOWN, -1);
135 if (filename == NULL) 135 if (filename == NULL)
136 { 136 {
137 filename = GNUNET_strdup (_("no name given")); 137 filename = GNUNET_strdup (_("no name given"));
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index a0d34c3f..94f82dc4 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -723,9 +723,8 @@ initiateDownload (GtkTreeModel * model,
723 strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath)); 723 strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath));
724 strcpy (sdc.idc_final_download_destination, final_download_dir); 724 strcpy (sdc.idc_final_download_destination, final_download_dir);
725 if (sdc.idc_final_download_destination[strlen 725 if (sdc.idc_final_download_destination[strlen
726 (sdc. 726 (sdc.idc_final_download_destination)
727 idc_final_download_destination) - 727 - 1] != DIR_SEPARATOR)
728 1] != DIR_SEPARATOR)
729 strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR); 728 strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR);
730 strcat (sdc.idc_final_download_destination, dirPath); 729 strcat (sdc.idc_final_download_destination, dirPath);
731 strcat (sdc.idc_final_download_destination, idc_name); 730 strcat (sdc.idc_final_download_destination, idc_name);
@@ -824,9 +823,8 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
824 strcpy (sdc.idc_final_download_destination, final_download_dir); 823 strcpy (sdc.idc_final_download_destination, final_download_dir);
825 GNUNET_free (final_download_dir); 824 GNUNET_free (final_download_dir);
826 if (sdc.idc_final_download_destination[strlen 825 if (sdc.idc_final_download_destination[strlen
827 (sdc. 826 (sdc.idc_final_download_destination)]
828 idc_final_download_destination)] != 827 != DIR_SEPARATOR)
829 DIR_SEPARATOR)
830 strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR); 828 strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR);
831 strcat (sdc.idc_final_download_destination, dname); 829 strcat (sdc.idc_final_download_destination, dname);
832 830
diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c
index cb20bc7d..bd60154e 100644
--- a/src/plugins/fs/extensions/musicinsert.c
+++ b/src/plugins/fs/extensions/musicinsert.c
@@ -518,13 +518,12 @@ insertfiles ()
518 while (dirkeywords[n]) 518 while (dirkeywords[n])
519 { 519 {
520 GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS, 520 GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
521 dirkeywords[n]); 521 dirkeywords[n]);
522 n++; 522 n++;
523 } 523 }
524 /* Add a standard keyword to allow finding all available music albums 524 /* Add a standard keyword to allow finding all available music albums
525 * on AFS in one search */ 525 * on AFS in one search */
526 GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS, 526 GNUNET_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS, "music album");
527 "music album");
528 527
529 528
530 /* Manage files metadatas */ 529 /* Manage files metadatas */
@@ -548,8 +547,7 @@ insertfiles ()
548 useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3; 547 useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
549 548
550 filesmetadatas = 549 filesmetadatas =
551 g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_MetaData *), 550 g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_MetaData *), 20);
552 20);
553 files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20); 551 files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
554 i = 0; 552 i = 0;
555 do 553 do
@@ -572,28 +570,25 @@ insertfiles ()
572 570
573 if (tempmetas[1]) 571 if (tempmetas[1])
574 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, 572 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
575 tempmetas[1]); 573 tempmetas[1]);
576 if ((useforallflags & 0x1) && dirmetas[0]) 574 if ((useforallflags & 0x1) && dirmetas[0])
577 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, 575 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
578 dirmetas[0]); 576 dirmetas[0]);
579 else if (!(useforallflags & 0x1) && tempmetas[2]) 577 else if (!(useforallflags & 0x1) && tempmetas[2])
580 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_TITLE, 578 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_TITLE, tempmetas[2]);
581 tempmetas[2]);
582 if ((useforallflags & 0x2) && dirmetas[1]) 579 if ((useforallflags & 0x2) && dirmetas[1])
583 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST, 580 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST, dirmetas[1]);
584 dirmetas[1]);
585 else if (!(useforallflags & 0x2) && tempmetas[3]) 581 else if (!(useforallflags & 0x2) && tempmetas[3])
586 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME, 582 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
587 tempmetas[3]); 583 tempmetas[3]);
588 if (tempmetas[4]) 584 if (tempmetas[4])
589 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM, 585 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM, tempmetas[4]);
590 tempmetas[4]);
591 if (tempmetas[5]) 586 if (tempmetas[5])
592 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE, 587 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE,
593 tempmetas[5]); 588 tempmetas[5]);
594 if (tempmetas[6]) 589 if (tempmetas[6])
595 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT, 590 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT,
596 tempmetas[6]); 591 tempmetas[6]);
597 592
598 if (!(useforallflags & 0x1)) 593 if (!(useforallflags & 0x1))
599 { 594 {
@@ -601,7 +596,7 @@ insertfiles ()
601 while (dirkeywords[n]) 596 while (dirkeywords[n])
602 { 597 {
603 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS, 598 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
604 dirkeywords[n]); 599 dirkeywords[n]);
605 n++; 600 n++;
606 } 601 }
607 } 602 }
@@ -612,15 +607,13 @@ insertfiles ()
612 while (tempkeywords[n]) 607 while (tempkeywords[n])
613 { 608 {
614 GNUNET_meta_data_insert (tempmetadata, 609 GNUNET_meta_data_insert (tempmetadata,
615 EXTRACTOR_KEYWORDS, 610 EXTRACTOR_KEYWORDS, tempkeywords[n]);
616 tempkeywords[n]);
617 n++; 611 n++;
618 } 612 }
619 g_strfreev (tempkeywords); 613 g_strfreev (tempkeywords);
620 /* Add a standard keyword to allow finding all available music files 614 /* Add a standard keyword to allow finding all available music files
621 * on AFS in one search */ 615 * on AFS in one search */
622 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS, 616 GNUNET_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS, "music");
623 "music");
624 } 617 }
625 618
626 GNUNET_free (tempmetas); 619 GNUNET_free (tempmetas);
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 2549e90d..163d103c 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -232,7 +232,7 @@ saveEventProcessor (void *cls)
232 break; 232 break;
233 case GNUNET_FSUI_upload_error: 233 case GNUNET_FSUI_upload_error:
234 fs_upload_error (event->data.UploadError.uc.cctx, 234 fs_upload_error (event->data.UploadError.uc.cctx,
235 event->data.UploadError.message); 235 event->data.UploadError.message);
236 break; 236 break;
237 case GNUNET_FSUI_upload_aborted: 237 case GNUNET_FSUI_upload_aborted:
238 fs_upload_aborted (event->data.UploadAborted.uc.cctx); 238 fs_upload_aborted (event->data.UploadAborted.uc.cctx);
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 6e11a102..82713e8b 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -359,7 +359,7 @@ getMetaDataFromList (GladeXML * xml,
359 length); 359 length);
360 free (thumb); 360 free (thumb);
361 GNUNET_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA, 361 GNUNET_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA,
362 binary); 362 binary);
363 GNUNET_free (binary); 363 GNUNET_free (binary);
364 } 364 }
365 } 365 }
@@ -471,14 +471,14 @@ getFileNameFromMetaData (const struct GNUNET_MetaData *meta)
471 char *name; 471 char *name;
472 472
473 name = GNUNET_meta_data_get_first_by_types (meta, 473 name = GNUNET_meta_data_get_first_by_types (meta,
474 EXTRACTOR_FILENAME, 474 EXTRACTOR_FILENAME,
475 EXTRACTOR_TITLE, 475 EXTRACTOR_TITLE,
476 EXTRACTOR_ARTIST, 476 EXTRACTOR_ARTIST,
477 EXTRACTOR_AUTHOR, 477 EXTRACTOR_AUTHOR,
478 EXTRACTOR_PUBLISHER, 478 EXTRACTOR_PUBLISHER,
479 EXTRACTOR_CREATOR, 479 EXTRACTOR_CREATOR,
480 EXTRACTOR_PRODUCER, 480 EXTRACTOR_PRODUCER,
481 EXTRACTOR_UNKNOWN, -1); 481 EXTRACTOR_UNKNOWN, -1);
482 if (name == NULL) 482 if (name == NULL)
483 { 483 {
484 name = GNUNET_strdup (_("no name given")); 484 name = GNUNET_strdup (_("no name given"));
@@ -499,14 +499,14 @@ getDescriptionFromMetaData (const struct GNUNET_MetaData *meta)
499 char *desc; 499 char *desc;
500 500
501 desc = GNUNET_meta_data_get_first_by_types (meta, 501 desc = GNUNET_meta_data_get_first_by_types (meta,
502 EXTRACTOR_DESCRIPTION, 502 EXTRACTOR_DESCRIPTION,
503 EXTRACTOR_GENRE, 503 EXTRACTOR_GENRE,
504 EXTRACTOR_ALBUM, 504 EXTRACTOR_ALBUM,
505 EXTRACTOR_COMMENT, 505 EXTRACTOR_COMMENT,
506 EXTRACTOR_SUBJECT, 506 EXTRACTOR_SUBJECT,
507 EXTRACTOR_FORMAT, 507 EXTRACTOR_FORMAT,
508 EXTRACTOR_SIZE, 508 EXTRACTOR_SIZE,
509 EXTRACTOR_KEYWORDS, -1); 509 EXTRACTOR_KEYWORDS, -1);
510 if (desc == NULL) 510 if (desc == NULL)
511 desc = GNUNET_strdup (""); 511 desc = GNUNET_strdup ("");
512 return GNUNET_GTK_validate_utf8 (desc); 512 return GNUNET_GTK_validate_utf8 (desc);
diff --git a/src/plugins/fs/meta.h b/src/plugins/fs/meta.h
index 3c2c2c6b..d9ab6293 100644
--- a/src/plugins/fs/meta.h
+++ b/src/plugins/fs/meta.h
@@ -53,8 +53,8 @@ void handleMetaDataListUpdate (GladeXML * xml,
53void handleListRemove (GladeXML * xml, const char *listName); 53void handleListRemove (GladeXML * xml, const char *listName);
54 54
55struct GNUNET_MetaData *getMetaDataFromList (GladeXML * xml, 55struct GNUNET_MetaData *getMetaDataFromList (GladeXML * xml,
56 const char *name, 56 const char *name,
57 const char *preview); 57 const char *preview);
58 58
59struct GNUNET_ECRS_URI *getKeywordURIFromList (GladeXML * xml, 59struct GNUNET_ECRS_URI *getKeywordURIFromList (GladeXML * xml,
60 const char *name); 60 const char *name);
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 4f24bd5e..ac5a9aea 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -321,14 +321,14 @@ addNamespaceContentToModel (void *cls,
321 321
322 GNUNET_GTK_DEBUG_BEGIN (); 322 GNUNET_GTK_DEBUG_BEGIN ();
323 filename = GNUNET_meta_data_get_first_by_types (fi->meta, 323 filename = GNUNET_meta_data_get_first_by_types (fi->meta,
324 EXTRACTOR_FILENAME, 324 EXTRACTOR_FILENAME,
325 EXTRACTOR_TITLE, 325 EXTRACTOR_TITLE,
326 EXTRACTOR_ARTIST, 326 EXTRACTOR_ARTIST,
327 EXTRACTOR_AUTHOR, 327 EXTRACTOR_AUTHOR,
328 EXTRACTOR_PUBLISHER, 328 EXTRACTOR_PUBLISHER,
329 EXTRACTOR_CREATOR, 329 EXTRACTOR_CREATOR,
330 EXTRACTOR_PRODUCER, 330 EXTRACTOR_PRODUCER,
331 EXTRACTOR_UNKNOWN, -1); 331 EXTRACTOR_UNKNOWN, -1);
332 if (filename == NULL) 332 if (filename == NULL)
333 filename = GNUNET_strdup (_("no name given")); 333 filename = GNUNET_strdup (_("no name given"));
334 else 334 else
@@ -339,14 +339,14 @@ addNamespaceContentToModel (void *cls,
339 dotdot[0] = dotdot[1] = '_'; 339 dotdot[0] = dotdot[1] = '_';
340 } 340 }
341 desc = GNUNET_meta_data_get_first_by_types (fi->meta, 341 desc = GNUNET_meta_data_get_first_by_types (fi->meta,
342 EXTRACTOR_DESCRIPTION, 342 EXTRACTOR_DESCRIPTION,
343 EXTRACTOR_GENRE, 343 EXTRACTOR_GENRE,
344 EXTRACTOR_ALBUM, 344 EXTRACTOR_ALBUM,
345 EXTRACTOR_COMMENT, 345 EXTRACTOR_COMMENT,
346 EXTRACTOR_SUBJECT, 346 EXTRACTOR_SUBJECT,
347 EXTRACTOR_FORMAT, 347 EXTRACTOR_FORMAT,
348 EXTRACTOR_SIZE, 348 EXTRACTOR_SIZE,
349 EXTRACTOR_KEYWORDS, -1); 349 EXTRACTOR_KEYWORDS, -1);
350 if (desc == NULL) 350 if (desc == NULL)
351 desc = GNUNET_strdup (""); 351 desc = GNUNET_strdup ("");
352 mime = GNUNET_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE); 352 mime = GNUNET_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
@@ -994,7 +994,8 @@ fs_namespace_start ()
994 GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL); 994 GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
995 GNUNET_pseudonym_list_all (ectx, cfg, &addTabForNamespace, NULL); 995 GNUNET_pseudonym_list_all (ectx, cfg, &addTabForNamespace, NULL);
996 GNUNET_pseudonym_register_discovery_callback (ectx, cfg, 996 GNUNET_pseudonym_register_discovery_callback (ectx, cfg,
997 &namespace_discovered_cb, NULL); 997 &namespace_discovered_cb,
998 NULL);
998 GNUNET_GTK_DEBUG_END (); 999 GNUNET_GTK_DEBUG_END ();
999} 1000}
1000 1001
@@ -1003,7 +1004,7 @@ void
1003fs_namespace_stop () 1004fs_namespace_stop ()
1004{ 1005{
1005 GNUNET_pseudonym_unregister_discovery_callback (&namespace_discovered_cb, 1006 GNUNET_pseudonym_unregister_discovery_callback (&namespace_discovered_cb,
1006 NULL); 1007 NULL);
1007 while (head != NULL) 1008 while (head != NULL)
1008 frame_destroy (head->treeview); 1009 frame_destroy (head->treeview);
1009 GNUNET_URITRACK_unregister_track_callback (&updateViewSave, NULL); 1010 GNUNET_URITRACK_unregister_track_callback (&updateViewSave, NULL);
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index 4bd9c842..afa37136 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -83,7 +83,7 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
83 GNUNET_enc_to_hash (encStr, &nsid); 83 GNUNET_enc_to_hash (encStr, &nsid);
84 newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)); 84 newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
85 rating = GNUNET_pseudonym_rank (ectx, 85 rating = GNUNET_pseudonym_rank (ectx,
86 cfg, &nsid, newrating - rating); 86 cfg, &nsid, newrating - rating);
87 if (rating != newrating) 87 if (rating != newrating)
88 { 88 {
89 /* concurrent modification? */ 89 /* concurrent modification? */
@@ -228,17 +228,17 @@ saveDiscovery (void *cls)
228 { 228 {
229 dmd = GNUNET_meta_data_duplicate (nni->md); 229 dmd = GNUNET_meta_data_duplicate (nni->md);
230 desc = GNUNET_meta_data_get_first_by_types (dmd, 230 desc = GNUNET_meta_data_get_first_by_types (dmd,
231 EXTRACTOR_DESCRIPTION, 231 EXTRACTOR_DESCRIPTION,
232 EXTRACTOR_TITLE, 232 EXTRACTOR_TITLE,
233 EXTRACTOR_AUTHOR, 233 EXTRACTOR_AUTHOR,
234 EXTRACTOR_GENRE, 234 EXTRACTOR_GENRE,
235 EXTRACTOR_SUBJECT, 235 EXTRACTOR_SUBJECT,
236 EXTRACTOR_CREATOR, 236 EXTRACTOR_CREATOR,
237 EXTRACTOR_PRODUCER, 237 EXTRACTOR_PRODUCER,
238 EXTRACTOR_GROUP, 238 EXTRACTOR_GROUP,
239 EXTRACTOR_CREATED_FOR, 239 EXTRACTOR_CREATED_FOR,
240 EXTRACTOR_SUMMARY, 240 EXTRACTOR_SUMMARY,
241 EXTRACTOR_OWNER, -1); 241 EXTRACTOR_OWNER, -1);
242 if (desc == NULL) 242 if (desc == NULL)
243 desc = GNUNET_strdup (""); 243 desc = GNUNET_strdup ("");
244 } 244 }
diff --git a/src/plugins/fs/namespace_search.h b/src/plugins/fs/namespace_search.h
index 2b42c5b1..06c553e4 100644
--- a/src/plugins/fs/namespace_search.h
+++ b/src/plugins/fs/namespace_search.h
@@ -38,8 +38,7 @@
38 */ 38 */
39int namespace_discovered_cb (void *cls, 39int namespace_discovered_cb (void *cls,
40 const GNUNET_HashCode * namespaceId, 40 const GNUNET_HashCode * namespaceId,
41 const struct GNUNET_MetaData *md, 41 const struct GNUNET_MetaData *md, int rating);
42 int rating);
43 42
44 43
45 44
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 3f070ae2..f6a96470 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -512,7 +512,7 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
512 meta = GNUNET_meta_data_create (); 512 meta = GNUNET_meta_data_create ();
513 GNUNET_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString); 513 GNUNET_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
514 GNUNET_meta_data_insert (meta, EXTRACTOR_DESCRIPTION, 514 GNUNET_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
515 _("Saved search results")); 515 _("Saved search results"));
516 GNUNET_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk"); 516 GNUNET_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
517 if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL, 517 if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
518 &directory, &dir_len, 518 &directory, &dir_len,
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 0796c7f3..9a7913f9 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -97,13 +97,12 @@ fs_upload_aborted (UploadList * list)
97 gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path); 97 gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
98 gtk_tree_path_free (path); 98 gtk_tree_path_free (path);
99 gtk_tree_store_set (upload_summary, &iter, 99 gtk_tree_store_set (upload_summary, &iter,
100 UPLOAD_URISTRING, _("Aborted."), 100 UPLOAD_URISTRING, _("Aborted."),
101 UPLOAD_PROGRESS, 0, 101 UPLOAD_PROGRESS, 0, -1);
102 -1);
103} 102}
104 103
105void 104void
106fs_upload_error (UploadList * list, const char * emsg) 105fs_upload_error (UploadList * list, const char *emsg)
107{ 106{
108 GtkTreeIter iter; 107 GtkTreeIter iter;
109 GtkTreePath *path; 108 GtkTreePath *path;
@@ -112,17 +111,14 @@ fs_upload_error (UploadList * list, const char * emsg)
112 111
113 list->has_terminated = GNUNET_YES; 112 list->has_terminated = GNUNET_YES;
114 list->uri = NULL; 113 list->uri = NULL;
115 len = strlen(_("Error uploading file: `%s'")) + strlen(emsg) + 2; 114 len = strlen (_("Error uploading file: `%s'")) + strlen (emsg) + 2;
116 us = GNUNET_malloc(len); 115 us = GNUNET_malloc (len);
117 GNUNET_snprintf(us, len, 116 GNUNET_snprintf (us, len, _("Error uploading file: `%s'"), emsg);
118 _("Error uploading file: `%s'"),
119 emsg);
120 path = gtk_tree_row_reference_get_path (list->summaryViewRowReference); 117 path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
121 gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path); 118 gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
122 gtk_tree_path_free (path); 119 gtk_tree_path_free (path);
123 gtk_tree_store_set (upload_summary, &iter, 120 gtk_tree_store_set (upload_summary, &iter,
124 UPLOAD_URISTRING, us, 121 UPLOAD_URISTRING, us, UPLOAD_PROGRESS, 0, -1);
125 UPLOAD_PROGRESS, 0, -1);
126 GNUNET_free (us); 122 GNUNET_free (us);
127} 123}
128 124
diff --git a/src/plugins/fs/upload.h b/src/plugins/fs/upload.h
index 24f41946..888dd807 100644
--- a/src/plugins/fs/upload.h
+++ b/src/plugins/fs/upload.h
@@ -34,8 +34,7 @@ void fs_upload_update (UploadList * list, unsigned long long completed,
34 34
35void fs_upload_complete (UploadList * list, struct GNUNET_ECRS_URI *uri); 35void fs_upload_complete (UploadList * list, struct GNUNET_ECRS_URI *uri);
36 36
37void fs_upload_error (UploadList * list, 37void fs_upload_error (UploadList * list, const char *emsg);
38 const char * emsg);
39 38
40void fs_upload_aborted (UploadList * list); 39void fs_upload_aborted (UploadList * list);
41 40
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 10:31:19 +0000