1 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index b9fceec8..2e352bb7 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -41,7 +41,7 @@ struct GNUNET_CHAT_safe_nick_write_struct
 {
   GtkListStore *model;
   GdkPixbuf *icon;
-  const struct GNUNET_ECRS_MetaData *meta;
+  const struct GNUNET_MetaData *meta;
   const char *nick;
   GNUNET_HashCode pid;
 };
@@ -119,7 +119,7 @@ add_nick_save_call (void *arg)
                       &iter,
                       CHAT_PID, pid,
                       CHAT_METADATA,
-                      GNUNET_ECRS_meta_data_duplicate (cls->meta), CHAT_ICON,
+                      GNUNET_meta_data_duplicate (cls->meta), CHAT_ICON,
                       cls->icon, CHAT_NICKNAME, cls->nick, -1);
   return NULL;
 }
@@ -134,7 +134,7 @@ remove_nick_save_call (void *arg)
   GtkListStore *model;
   GtkTreeIter iter;
   GNUNET_HashCode *pid;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
 
   model = GTK_LIST_STORE (cls->model);
   /* find and remove existing entry */
@@ -149,7 +149,7 @@ remove_nick_save_call (void *arg)
           if ((pid != NULL) &&
               (0 == memcmp (pid, &cls->pid, sizeof (GNUNET_HashCode))))
             {
-              GNUNET_ECRS_meta_data_destroy (meta);
+              GNUNET_meta_data_destroy (meta);
               GNUNET_free (pid);
               gtk_list_store_remove (model, &iter);
               return NULL;      /* done! */
@@ -178,7 +178,7 @@ static int
 receive_callback (void *cls,
                   struct GNUNET_CHAT_Room *room,
                   const GNUNET_HashCode * sender,
-                  const struct GNUNET_ECRS_MetaData *member_info,
+                  const struct GNUNET_MetaData *member_info,
                   const char *message, GNUNET_CHAT_MSG_OPTIONS options)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
@@ -186,7 +186,7 @@ receive_callback (void *cls,
   char *sndr;
 
   sndr =
-    sender == NULL ? _("anonymous") : GNUNET_PSEUDO_id_to_name (chat_ectx,
+    sender == NULL ? _("anonymous") : GNUNET_pseudonym_id_to_name (chat_ectx,
                                                                 chat_cfg,
                                                                 sender);
   writearg.text_view = client->text_view;
@@ -199,7 +199,7 @@ receive_callback (void *cls,
 
 static int
 member_list_callback (void *cls,
-                      const struct GNUNET_ECRS_MetaData *member_info,
+                      const struct GNUNET_MetaData *member_info,
                       const GNUNET_RSA_PublicKey * pkey,
                       GNUNET_CHAT_MSG_OPTIONS opt)
 {
@@ -208,7 +208,7 @@ member_list_callback (void *cls,
   char *nick;
 
   GNUNET_hash (pkey, sizeof (GNUNET_RSA_PublicKey), &writearg.pid);
-  nick = GNUNET_PSEUDO_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
+  nick = GNUNET_pseudonym_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
   writearg.model = client->nick_model;
   /* FIXME: set icon if pid == ours */
   writearg.icon = NULL;
@@ -264,7 +264,7 @@ create_chat_room_tab (const char *room_name, const char *nick)
   GtkWidget *chatnotebook;
   GtkTreeView *treeview;
   struct GNUNET_CHAT_gui_chat_client *client;
-  struct GNUNET_ECRS_MetaData *meta;
+  struct GNUNET_MetaData *meta;
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   int col;
@@ -329,8 +329,8 @@ create_chat_room_tab (const char *room_name, const char *nick)
   list = client;
   GNUNET_mutex_unlock (lock);
 
-  meta = GNUNET_ECRS_meta_data_create ();
-  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_TITLE, nick);
+  meta = GNUNET_meta_data_create ();
+  GNUNET_meta_data_insert (meta, EXTRACTOR_TITLE, nick);
   client->room =
     GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick,
                            meta,
@@ -338,7 +338,7 @@ create_chat_room_tab (const char *room_name, const char *nick)
                            -1,
                            &receive_callback, client, &member_list_callback,
                            client, NULL, NULL, &client->mypid);
-  GNUNET_ECRS_meta_data_destroy (meta);
+  GNUNET_meta_data_destroy (meta);
 }
 
 void