1 files changed, 40 insertions, 21 deletions

diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index ab935b7d..33af07fe 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -28,6 +28,21 @@
 
 #include "chat.h"
 
+struct GNUNET_CHAT_safe_write_struct
+{
+  GtkWidget *chatWindow;
+  const char *message;
+  const GNUNET_HashCode *sender;
+};
+
+struct GNUNET_CHAT_safe_nick_write_struct
+{
+  GtkWidget *nickList;
+  const char *nick;
+};
+
+
+
 static struct GNUNET_ClientServerConnection *sock;
 
 static struct GNUNET_Mutex *lock;
@@ -52,11 +67,11 @@ write_save_call (void *arg)
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (writeholder->chatWindow));
   message_buf_size =
-    snprintf (NULL, 0, "<%s> %s", writeholder->senderNick,
+    snprintf (NULL, 0, "<> %s", /* writeholder->senderNick,*/
               writeholder->message);
   message_buf = GNUNET_malloc (message_buf_size + 2);
-  snprintf (message_buf, message_buf_size + 2, "<%s> %s\n",
-            writeholder->senderNick, writeholder->message);
+  snprintf (message_buf, message_buf_size + 2, "<FIXME> %s\n",
+            /*writeholder->senderNick,*/ writeholder->message);
   gtk_text_buffer_insert_at_cursor (buffer, message_buf,
                                     message_buf_size + 1);
 
@@ -157,13 +172,12 @@ remove_nick_save_call (void *arg)
 static int
 receive_callback (void *cls,
                   struct GNUNET_CHAT_Room *room,
-                  const char *senderNick,
+                  const GNUNET_HashCode *sender,
                   const char *message,
-                  GNUNET_CronTime timestamp, GNUNET_CHAT_MSG_OPTIONS options)
+                  GNUNET_CHAT_MSG_OPTIONS options)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
   GtkWidget *chattextviewer;
-
   GList *children;
   struct GNUNET_CHAT_safe_write_struct writearg;
 
@@ -177,7 +191,7 @@ receive_callback (void *cls,
 
   writearg.chatWindow = chattextviewer;
   writearg.message = message;
-  writearg.senderNick = senderNick;
+  writearg.sender = sender;
   GNUNET_GTK_save_call (&write_save_call, &writearg);
 
   /*Write the message to the appropriate room... 
@@ -189,30 +203,31 @@ receive_callback (void *cls,
 }
 
 static int
-member_list_callback (void *cls, const char *senderNick,
-                      int is_joining, GNUNET_CronTime timestamp)
+member_list_callback (void *cls,
+                      const struct GNUNET_ECRS_MetaData * member_info,
+                      const GNUNET_RSA_PublicKey * pkey)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
   GtkWidget *chatnicklist;
+#if 0
   struct GNUNET_CHAT_safe_nick_write_struct writearg;
-
+#endif
   chatnicklist =
     g_list_nth_data (gtk_container_get_children
                      (GTK_CONTAINER (client->chatFrame)), 1);
   chatnicklist =
     g_list_nth_data (gtk_container_get_children
                      (GTK_CONTAINER (chatnicklist)), 0);
-
+#if 0
   /* chatnicklist is the GtkTextView object */
-  writearg.nick = senderNick;
+  writearg.nick = member_info;
   writearg.nickList = chatnicklist;
 
-  g_print ("received nick %s calling safe write call\n", writearg.nick);
   if (is_joining)
     GNUNET_GTK_save_call (&write_nick_save_call, &writearg);
   else
     GNUNET_GTK_save_call (&remove_nick_save_call, &writearg);
-
+#endif
   return GNUNET_OK;
 }
 
@@ -275,6 +290,7 @@ create_chat_room_tab (char *room_name, char *nick)
   struct GNUNET_CHAT_Room *chatRoom;
   struct GNUNET_CHAT_gui_chat_client *client;
   struct GNUNET_CHAT_gui_chat_client *pos;
+  struct GNUNET_ECRS_MetaData * meta;
 
   chatnotebook =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "chatnotebook");
@@ -295,12 +311,15 @@ create_chat_room_tab (char *room_name, char *nick)
   strcpy (client->room_name, room_name);
 
   /* We do a silly strdup later on member_info... either check for NULL or only pass "" for member_info!! */
+  meta = GNUNET_ECRS_meta_data_create();
   chatRoom =
-    GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick, room_name,
-                           "",
+    GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick,
+                           meta,
+                           room_name,
                            &receive_callback, client, &member_list_callback,
-                           client);
-
+                           client,
+                           NULL, NULL);
+  GNUNET_ECRS_meta_data_destroy(meta);
   client->room = chatRoom;
   client->chatFrame = newChatWindow;
   client->number =
@@ -337,7 +356,7 @@ on_chat_frame_send_button_click_event_chat (GtkWidget * widget, gpointer data)
   GtkWidget *curr_page;
   GList *children;
   GtkEntry *chat_entry;
-
+  unsigned int seq;
   char *message;
   const gchar *room_name;
   struct GNUNET_CHAT_gui_chat_client *client;
@@ -387,8 +406,8 @@ on_chat_frame_send_button_click_event_chat (GtkWidget * widget, gpointer data)
   else
     return;
 
-  GNUNET_CHAT_send_message (client->room, message, NULL,
-                            NULL, GNUNET_CHAT_MSG_OPTION_NONE, NULL);
+  GNUNET_CHAT_send_message (client->room, message,
+                            GNUNET_CHAT_MSG_OPTION_NONE, NULL, &seq);
 
   gtk_entry_set_text (chat_entry, "");