1 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
index 3d72db4a..c1c7b8cd 100644
--- a/src/plugins/fs/directory.c
+++ b/src/plugins/fs/directory.c
@@ -44,9 +44,9 @@ selectFile ()
   char *ret;
 
   uploadXML
-    = glade_xml_new (getGladeFileName (),
-                     "openDirectoryFileDialog", PACKAGE_NAME);
-  connectGladeWithPlugins (uploadXML);
+    = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                     "openDirectoryFileDialog", PACKAGNUNET_GENAME);
+  GNUNET_GTK_connect_glade_with_plugins (uploadXML);
   dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
                                                    "openDirectoryFileDialog"));
   if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
@@ -67,7 +67,7 @@ selectFile ()
 #endif /* MINGW */
 
 static int
-spcb (const ECRS_FileInfo * fi,
+spcb (const GNUNET_ECRS_FileInfo * fi,
       const GNUNET_HashCode * key, int isRoot, void *closure)
 {
   SearchList *list = closure;
@@ -83,10 +83,10 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   char *directory_data;
   unsigned long long directory_data_len;
   size_t dlen;
-  struct ECRS_MetaData *md;
+  struct GNUNET_ECRS_MetaData *md;
   int fd;
   SearchList *list;
-  struct ECRS_URI *uri;
+  struct GNUNET_ECRS_URI *uri;
   const char *kws[2];
   GtkNotebook *notebook;
 
@@ -97,14 +97,14 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
                               dn)) ||
       (GNUNET_OK != GNUNET_disk_file_size (NULL, dn, &directory_data_len, GNUNET_YES)))
     {
-      addLogEntry (_("Error accessing file `%s'."), dn);
+      GNUNET_GTK_add_log_entry (_("Error accessing file `%s'."), dn);
       GNUNET_free (dn);
       return;
     }
   fd = GNUNET_disk_file_open (NULL, dn, O_LARGEFILE | O_RDONLY);
   if (fd == -1)
     {
-      addLogEntry (_("Error opening file `%s'."), dn);
+      GNUNET_GTK_add_log_entry (_("Error opening file `%s'."), dn);
       GNUNET_free (dn);
       return;
     }
@@ -112,38 +112,38 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   directory_data = MMAP (NULL, dlen, PROT_READ, MAP_SHARED, fd, 0);
   if (directory_data == MAP_FAILED)
     {
-      addLogEntry (_("Error mapping file `%s' into memory."), dn);
+      GNUNET_GTK_add_log_entry (_("Error mapping file `%s' into memory."), dn);
       CLOSE (fd);
       GNUNET_free (dn);
       return;
     }
   kws[0] = dn;
   kws[1] = NULL;
-  uri = ECRS_keywordsToUri (kws);
+  uri = GNUNET_ECRS_keyword_string_to_uri (kws);
   md = NULL;
-  list = fs_search_started (NULL, uri, 0, 0, NULL, FSUI_COMPLETED);
-  ECRS_freeUri (uri);
-  ECRS_listDirectory (NULL,
+  list = fs_search_started (NULL, uri, 0, 0, NULL, GNUNET_FSUI_COMPLETED);
+  GNUNET_ECRS_uri_destroy (uri);
+  GNUNET_ECRS_directory_list_contents (NULL,
                       directory_data, directory_data_len, &md, &spcb, list);
   if (md != NULL)
-    ECRS_freeMetaData (md);
+    GNUNET_ECRS_meta_data_destroy (md);
   MUNMAP (directory_data, dlen);
   CLOSE (fd);
   GNUNET_free (dn);
 
   /* switch view -- select directory */
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
   gtk_notebook_set_current_page (notebook,
                                  gtk_notebook_page_num (notebook,
                                                         list->searchpage));
 
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "fsnotebook"));
+    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook"));
   gtk_notebook_set_current_page (notebook,
                                  gtk_notebook_page_num (notebook,
                                                         glade_xml_get_widget
-                                                        (getMainXML (),
+                                                        (GNUNET_GTK_get_main_glade_XML (),
                                                          "fsdownloadvbox")));
 }