1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c
index 0e5798f5..8948e44d 100644
--- a/src/plugins/fs/extensions/musicinsert.c
+++ b/src/plugins/fs/extensions/musicinsert.c
@@ -349,7 +349,7 @@ set_File_Keywords (const gchar * filename)
       (g_list_find_custom
        (ArtistList, keywords[3], (GCompareFunc) strcmp) == NULL))
     {
-      ArtistList = g_list_append (ArtistList, STRDUP (keywords[3]));
+      ArtistList = g_list_append (ArtistList, GNUNET_strdup (keywords[3]));
       gtk_combo_box_append_text (GTK_COMBO_BOX (artistcombobox), keywords[3]);
     }
 
@@ -359,7 +359,7 @@ set_File_Keywords (const gchar * filename)
       (g_list_find_custom
        (AlbumList, keywords[4], (GCompareFunc) strcmp)) == NULL)
     {
-      AlbumList = g_list_append (AlbumList, STRDUP (keywords[4]));
+      AlbumList = g_list_append (AlbumList, GNUNET_strdup (keywords[4]));
       gtk_combo_box_append_text (GTK_COMBO_BOX (albumcombobox), keywords[4]);
     }
 
@@ -369,7 +369,7 @@ set_File_Keywords (const gchar * filename)
     {
       if ((g_list_find_custom
            (TypeList, keywords[5], (GCompareFunc) strcmp)) == NULL)
-        TypeList = g_list_append (TypeList, STRDUP (keywords[5]));
+        TypeList = g_list_append (TypeList, GNUNET_strdup (keywords[5]));
 
       if (strcmp (keywords[5], "application/ogg") == 0)
         gtk_combo_box_set_active (GTK_COMBO_BOX (typecombobox), FORMAT_OGG);
@@ -382,7 +382,7 @@ set_File_Keywords (const gchar * filename)
     }
   else
     {
-      TypeList = g_list_append (TypeList, STRDUP ("unspecified"));
+      TypeList = g_list_append (TypeList, GNUNET_strdup ("unspecified"));
     }
 
   keywords[6] =
@@ -480,7 +480,7 @@ insertfiles ()
                                       &fileiter))
     {
       gchar *error_message =
-        STRDUP (_
+        GNUNET_strdup (_
                 ("No files to insert ! Please add files to the list before validating."));
       GtkWidget *message_dialog =
         gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
@@ -490,7 +490,7 @@ insertfiles ()
                                 "%s", error_message);
       gtk_dialog_run (GTK_DIALOG (message_dialog));
       gtk_widget_destroy (message_dialog);
-      FREE (error_message);
+      GNUNET_free (error_message);
       return FALSE;
     }
 
@@ -609,7 +609,7 @@ insertfiles ()
           ECRS_addToMetaData (tempmetadata, EXTRACTOR_KEYWORDS, "music");
         }
 
-      FREE (tempmetas);
+      GNUNET_free (tempmetas);
       i++;
     }
   while (gtk_tree_model_iter_next
@@ -748,7 +748,7 @@ on_diraddbutton_clicked (GtkButton * button, gpointer user_data)
     }
   else
     {
-      gchar *error_message = STRDUP (_("Could not open the directory :\n"));
+      gchar *error_message = GNUNET_strdup (_("Could not open the directory :\n"));
       GtkWidget *message_dialog =
         gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
                                 GTK_DIALOG_DESTROY_WITH_PARENT,