2nd round of renaming

1 files changed, 26 insertions, 26 deletions

diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c
index 8948e44d..8b2ceac3 100644
--- a/src/plugins/fs/extensions/musicinsert.c
+++ b/src/plugins/fs/extensions/musicinsert.c
@@ -78,7 +78,7 @@ void
 show_musicinsertdialog ()
 {
   musicinsertXML =
-    glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog", PACKAGE_NAME);
+    glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog", PACKAGNUNET_GENAME);
   glade_xml_signal_autoconnect (musicinsertXML);
 /* libglade*/
 
@@ -458,8 +458,8 @@ updateColumns ()
 gboolean
 insertfiles ()
 {
-  struct ECRS_MetaData *dirmetadata;
-  struct ECRS_MetaData *tempmetadata;
+  struct GNUNET_ECRS_MetaData *dirmetadata;
+  struct GNUNET_ECRS_MetaData *tempmetadata;
   GArray *filesmetadatas, *files;
   gchar *temptext;
   gchar **dirkeywords;
@@ -485,7 +485,7 @@ insertfiles ()
       GtkWidget *message_dialog =
         gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
                                 GTK_DIALOG_DESTROY_WITH_PARENT,
-                                GTK_MESSAGE_ERROR,
+                                GTK_MESSAGNUNET_GEERROR,
                                 GTK_BUTTONS_CLOSE,
                                 "%s", error_message);
       gtk_dialog_run (GTK_DIALOG (message_dialog));
@@ -497,16 +497,16 @@ insertfiles ()
 
   /* Manage album metadatas */
 
-  dirmetadata = ECRS_createMetaData ();
+  dirmetadata = GNUNET_ECRS_meta_data_create ();
 
   dirmetas[0] =
     gtk_combo_box_get_active_text (GTK_COMBO_BOX (artistcombobox));
   if (dirmetas[0])
-    ECRS_addToMetaData (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
+    GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
 
   dirmetas[1] = gtk_combo_box_get_active_text (GTK_COMBO_BOX (albumcombobox));
   if (dirmetas[1])
-    ECRS_addToMetaData (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
+    GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
 
   keywordsentry = glade_xml_get_widget (musicinsertXML, "keywordsentry");
   temptext = (gchar *) gtk_entry_get_text (GTK_ENTRY (keywordsentry));
@@ -516,12 +516,12 @@ insertfiles ()
   n = 0;
   while (dirkeywords[n])
     {
-      ECRS_addToMetaData (dirmetadata, EXTRACTOR_KEYWORDS, dirkeywords[n]);
+      GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS, dirkeywords[n]);
       n++;
     }
   /* Add a standard keyword to allow finding all available music albums
    * on AFS in one search */
-  ECRS_addToMetaData (dirmetadata, EXTRACTOR_KEYWORDS, "music album");
+  GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS, "music album");
 
 
   /* Manage files metadatas */
@@ -545,12 +545,12 @@ insertfiles ()
   useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
 
   filesmetadatas =
-    g_array_sized_new (FALSE, FALSE, sizeof (struct ECRS_MetaData *), 20);
+    g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_ECRS_MetaData *), 20);
   files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
   i = 0;
   do
     {
-      tempmetadata = ECRS_createMetaData ();
+      tempmetadata = GNUNET_ECRS_meta_data_create ();
       tempmetas = malloc (sizeof (gchar *) * 8);
       g_array_append_val (filesmetadatas, tempmetadata);
       gtk_tree_model_get (GTK_TREE_MODEL (filelist_store),
@@ -567,28 +567,28 @@ insertfiles ()
 
 
       if (tempmetas[1])
-        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, tempmetas[1]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, tempmetas[1]);
       if ((useforallflags & 0x1) && dirmetas[0])
-        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, dirmetas[0]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, dirmetas[0]);
       else if (!(useforallflags & 0x1) && tempmetas[2])
-        ECRS_addToMetaData (tempmetadata, EXTRACTOR_TITLE, tempmetas[2]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_TITLE, tempmetas[2]);
       if ((useforallflags & 0x2) && dirmetas[1])
-        ECRS_addToMetaData (tempmetadata, EXTRACTOR_ARTIST, dirmetas[1]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ARTIST, dirmetas[1]);
       else if (!(useforallflags & 0x2) && tempmetas[3])
-        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, tempmetas[3]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, tempmetas[3]);
       if (tempmetas[4])
-        ECRS_addToMetaData (tempmetadata, EXTRACTOR_ALBUM, tempmetas[4]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ALBUM, tempmetas[4]);
       if (tempmetas[5])
-        ECRS_addToMetaData (tempmetadata, EXTRACTOR_MIMETYPE, tempmetas[5]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_MIMETYPE, tempmetas[5]);
       if (tempmetas[6])
-        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FORMAT, tempmetas[6]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FORMAT, tempmetas[6]);
 
       if (!(useforallflags & 0x1))
         {
           n = 0;
           while (dirkeywords[n])
             {
-              ECRS_addToMetaData (tempmetadata, EXTRACTOR_KEYWORDS,
+              GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS,
                                   dirkeywords[n]);
               n++;
             }
@@ -599,14 +599,14 @@ insertfiles ()
           n = 0;
           while (tempkeywords[n])
             {
-              ECRS_addToMetaData (tempmetadata,
+              GNUNET_ECRS_meta_data_inser (tempmetadata,
                                   EXTRACTOR_KEYWORDS, tempkeywords[n]);
               n++;
             }
           g_strfreev (tempkeywords);
           /* Add a standard keyword to allow finding all available music files
            * on AFS in one search */
-          ECRS_addToMetaData (tempmetadata, EXTRACTOR_KEYWORDS, "music");
+          GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS, "music");
         }
 
       GNUNET_free (tempmetas);
@@ -624,7 +624,7 @@ insertfiles ()
    * Artist: Song (Album) - Type and Format # for files
    * Artist: Album - Type and number of the files # or album
    *
-   * TODO : really call FSUI_upload() to insert these files */
+   * TODO : really call GNUNET_FSUI_upload() to insert these files */
 
   return TRUE;
 }
@@ -737,7 +737,7 @@ on_diraddbutton_clicked (GtkButton * button, gpointer user_data)
           GtkWidget *file_error_dialog =
             gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
-                                    GTK_MESSAGE_ERROR,
+                                    GTK_MESSAGNUNET_GEERROR,
                                     GTK_BUTTONS_CLOSE,
                                     file_error_message->str);
           gtk_dialog_run (GTK_DIALOG (file_error_dialog));
@@ -752,7 +752,7 @@ on_diraddbutton_clicked (GtkButton * button, gpointer user_data)
       GtkWidget *message_dialog =
         gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
                                 GTK_DIALOG_DESTROY_WITH_PARENT,
-                                GTK_MESSAGE_ERROR,
+                                GTK_MESSAGNUNET_GEERROR,
                                 GTK_BUTTONS_CLOSE,
                                 "%s%s", error_message,
                                 dir_opening_error->message);
@@ -824,7 +824,7 @@ on_fileaddbutton_clicked (GtkButton * button, gpointer user_data)
           GtkWidget *file_error_dialog =
             gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
                                     GTK_DIALOG_DESTROY_WITH_PARENT,
-                                    GTK_MESSAGE_ERROR,
+                                    GTK_MESSAGNUNET_GEERROR,
                                     GTK_BUTTONS_CLOSE,
                                     file_error_message->str);
           gtk_dialog_run (GTK_DIALOG (file_error_dialog));