aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/fs
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/fs')
-rw-r--r--src/plugins/fs/extensions/musicinsert.c30
-rw-r--r--src/plugins/fs/meta.c4
-rw-r--r--src/plugins/fs/search.c6
-rw-r--r--src/plugins/fs/upload.c2
4 files changed, 21 insertions, 21 deletions
diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c
index ea58f520..20301d2f 100644
--- a/src/plugins/fs/extensions/musicinsert.c
+++ b/src/plugins/fs/extensions/musicinsert.c
@@ -503,11 +503,11 @@ insertfiles ()
503 dirmetas[0] = 503 dirmetas[0] =
504 gtk_combo_box_get_active_text (GTK_COMBO_BOX (artistcombobox)); 504 gtk_combo_box_get_active_text (GTK_COMBO_BOX (artistcombobox));
505 if (dirmetas[0]) 505 if (dirmetas[0])
506 GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]); 506 GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
507 507
508 dirmetas[1] = gtk_combo_box_get_active_text (GTK_COMBO_BOX (albumcombobox)); 508 dirmetas[1] = gtk_combo_box_get_active_text (GTK_COMBO_BOX (albumcombobox));
509 if (dirmetas[1]) 509 if (dirmetas[1])
510 GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]); 510 GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
511 511
512 keywordsentry = glade_xml_get_widget (musicinsertXML, "keywordsentry"); 512 keywordsentry = glade_xml_get_widget (musicinsertXML, "keywordsentry");
513 temptext = (gchar *) gtk_entry_get_text (GTK_ENTRY (keywordsentry)); 513 temptext = (gchar *) gtk_entry_get_text (GTK_ENTRY (keywordsentry));
@@ -517,13 +517,13 @@ insertfiles ()
517 n = 0; 517 n = 0;
518 while (dirkeywords[n]) 518 while (dirkeywords[n])
519 { 519 {
520 GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS, 520 GNUNET_ECRS_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_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS, 526 GNUNET_ECRS_meta_data_insert (dirmetadata, EXTRACTOR_KEYWORDS,
527 "music album"); 527 "music album");
528 528
529 529
@@ -571,28 +571,28 @@ insertfiles ()
571 571
572 572
573 if (tempmetas[1]) 573 if (tempmetas[1])
574 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, 574 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
575 tempmetas[1]); 575 tempmetas[1]);
576 if ((useforallflags & 0x1) && dirmetas[0]) 576 if ((useforallflags & 0x1) && dirmetas[0])
577 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, 577 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
578 dirmetas[0]); 578 dirmetas[0]);
579 else if (!(useforallflags & 0x1) && tempmetas[2]) 579 else if (!(useforallflags & 0x1) && tempmetas[2])
580 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_TITLE, 580 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_TITLE,
581 tempmetas[2]); 581 tempmetas[2]);
582 if ((useforallflags & 0x2) && dirmetas[1]) 582 if ((useforallflags & 0x2) && dirmetas[1])
583 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ARTIST, 583 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_ARTIST,
584 dirmetas[1]); 584 dirmetas[1]);
585 else if (!(useforallflags & 0x2) && tempmetas[3]) 585 else if (!(useforallflags & 0x2) && tempmetas[3])
586 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, 586 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FILENAME,
587 tempmetas[3]); 587 tempmetas[3]);
588 if (tempmetas[4]) 588 if (tempmetas[4])
589 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ALBUM, 589 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_ALBUM,
590 tempmetas[4]); 590 tempmetas[4]);
591 if (tempmetas[5]) 591 if (tempmetas[5])
592 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_MIMETYPE, 592 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_MIMETYPE,
593 tempmetas[5]); 593 tempmetas[5]);
594 if (tempmetas[6]) 594 if (tempmetas[6])
595 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FORMAT, 595 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_FORMAT,
596 tempmetas[6]); 596 tempmetas[6]);
597 597
598 if (!(useforallflags & 0x1)) 598 if (!(useforallflags & 0x1))
@@ -600,7 +600,7 @@ insertfiles ()
600 n = 0; 600 n = 0;
601 while (dirkeywords[n]) 601 while (dirkeywords[n])
602 { 602 {
603 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS, 603 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
604 dirkeywords[n]); 604 dirkeywords[n]);
605 n++; 605 n++;
606 } 606 }
@@ -611,7 +611,7 @@ insertfiles ()
611 n = 0; 611 n = 0;
612 while (tempkeywords[n]) 612 while (tempkeywords[n])
613 { 613 {
614 GNUNET_ECRS_meta_data_inser (tempmetadata, 614 GNUNET_ECRS_meta_data_insert (tempmetadata,
615 EXTRACTOR_KEYWORDS, 615 EXTRACTOR_KEYWORDS,
616 tempkeywords[n]); 616 tempkeywords[n]);
617 n++; 617 n++;
@@ -619,7 +619,7 @@ insertfiles ()
619 g_strfreev (tempkeywords); 619 g_strfreev (tempkeywords);
620 /* Add a standard keyword to allow finding all available music files 620 /* Add a standard keyword to allow finding all available music files
621 * on AFS in one search */ 621 * on AFS in one search */
622 GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS, 622 GNUNET_ECRS_meta_data_insert (tempmetadata, EXTRACTOR_KEYWORDS,
623 "music"); 623 "music");
624 } 624 }
625 625
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index dca2b57f..e9da23c8 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -313,7 +313,7 @@ getMetaDataFromList (GladeXML * xml,
313 gtk_tree_model_get (metamodel, 313 gtk_tree_model_get (metamodel,
314 &iter, 314 &iter,
315 META_TYPE, &type, META_VALUE, &mvalue, -1); 315 META_TYPE, &type, META_VALUE, &mvalue, -1);
316 GNUNET_ECRS_meta_data_inser (meta, type, mvalue); 316 GNUNET_ECRS_meta_data_insert (meta, type, mvalue);
317 GNUNET_free_non_null (mvalue); 317 GNUNET_free_non_null (mvalue);
318 } 318 }
319 while (gtk_tree_model_iter_next (metamodel, &iter)); 319 while (gtk_tree_model_iter_next (metamodel, &iter));
@@ -358,7 +358,7 @@ getMetaDataFromList (GladeXML * xml,
358 binary = EXTRACTOR_binaryEncode ((const unsigned char *) thumb, 358 binary = EXTRACTOR_binaryEncode ((const unsigned char *) thumb,
359 length); 359 length);
360 free (thumb); 360 free (thumb);
361 GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_THUMBNAIL_DATA, 361 GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_THUMBNAIL_DATA,
362 binary); 362 binary);
363 GNUNET_free (binary); 363 GNUNET_free (binary);
364 } 364 }
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 5afa8621..514bae55 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -293,10 +293,10 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
293 } 293 }
294 while (gtk_tree_model_iter_next (model, &iter)); 294 while (gtk_tree_model_iter_next (model, &iter));
295 meta = GNUNET_ECRS_meta_data_create (); 295 meta = GNUNET_ECRS_meta_data_create ();
296 GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_KEYWORDS, list->searchString); 296 GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_KEYWORDS, list->searchString);
297 GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_DESCRIPTION, 297 GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_DESCRIPTION,
298 _("Saved search results")); 298 _("Saved search results"));
299 GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk"); 299 GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
300 if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL, 300 if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
301 &directory, &dir_len, 301 &directory, &dir_len,
302 fis_size, fis, meta)) 302 fis_size, fis, meta))
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index ac76006b..635c86ac 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -384,7 +384,7 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
384 filenamerest = &filename[strlen (filename) - 1]; 384 filenamerest = &filename[strlen (filename) - 1];
385 while ((filenamerest > filename) && (filenamerest[-1] != DIR_SEPARATOR)) 385 while ((filenamerest > filename) && (filenamerest[-1] != DIR_SEPARATOR))
386 filenamerest--; 386 filenamerest--;
387 GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_FILENAME, filenamerest); 387 GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_FILENAME, filenamerest);
388 createMetaDataListTreeView (metaXML, 388 createMetaDataListTreeView (metaXML,
389 "metaDataDialogMetaDataList", 389 "metaDataDialogMetaDataList",
390 "previewImage", meta); 390 "previewImage", meta);