1 files changed, 57 insertions, 33 deletions

diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index 33af07fe..9be89250 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -26,7 +26,14 @@
  * 
  */
 
-#include "chat.h"
+#include "platform.h"
+#include <GNUnet/gnunet_chat_lib.h>
+#include "gnunetgtk_common.h"
+
+/* YUCK -- why? */
+#include "../fs/meta.h"
+#include "../fs/meta.c"
+
 
 struct GNUNET_CHAT_safe_write_struct
 {
@@ -41,6 +48,23 @@ struct GNUNET_CHAT_safe_nick_write_struct
   const char *nick;
 };
 
+struct GNUNET_CHAT_gui_chat_client
+{
+  struct GNUNET_CHAT_gui_chat_client *next;
+  struct GNUNET_CHAT_gui_chat_client *prev;
+  int number;
+  GtkWidget *chatFrame;
+  struct GNUNET_CHAT_Room *room;
+  gchar *room_name;
+
+};
+
+struct GNUNET_CHAT_member_list
+{
+  struct GNUNET_CHAT_member_list *next;
+  struct GNUNET_CHAT_member_list *prev;
+  char *nick;
+};
 
 
 static struct GNUNET_ClientServerConnection *sock;
@@ -79,7 +103,7 @@ write_save_call (void *arg)
 }
 
 /* Safe call to add a nick to the chat room view */
-static void *
+/* static */ void *
 write_nick_save_call (void *arg)
 {
   struct GNUNET_CHAT_safe_nick_write_struct *writeholder = arg;
@@ -117,7 +141,7 @@ write_nick_save_call (void *arg)
 }
 
 /* Safe call to remove a nick from the chat room view */
-static void *
+/* static */ void *
 remove_nick_save_call (void *arg)
 {
   struct GNUNET_CHAT_safe_nick_write_struct *writeholder = arg;
@@ -173,6 +197,7 @@ static int
 receive_callback (void *cls,
                   struct GNUNET_CHAT_Room *room,
                   const GNUNET_HashCode *sender,
+                  const struct GNUNET_ECRS_MetaData * member_info,
                   const char *message,
                   GNUNET_CHAT_MSG_OPTIONS options)
 {
@@ -205,7 +230,8 @@ receive_callback (void *cls,
 static int
 member_list_callback (void *cls,
                       const struct GNUNET_ECRS_MetaData * member_info,
-                      const GNUNET_RSA_PublicKey * pkey)
+                      const GNUNET_RSA_PublicKey * pkey,
+                      GNUNET_CHAT_MSG_OPTIONS opt)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
   GtkWidget *chatnicklist;
@@ -256,31 +282,7 @@ init_chat (struct GNUNET_GE_Context *ectx,
   gtk_widget_show (tab);
 }
 
-void
-on_chat_room_name_button_click_event_chat (GtkWidget * widget, gpointer data)
-{
-  GtkEntry *room_entry;
-  GtkEntry *nick_entry;
-  char *room_text;
-  char *nick_text;
-
-  room_entry =
-    GTK_ENTRY (glade_xml_get_widget
-               (GNUNET_GTK_get_main_glade_XML (), "chatRoomNameEntry"));
-  nick_entry =
-    GTK_ENTRY (glade_xml_get_widget
-               (GNUNET_GTK_get_main_glade_XML (), "chatRoomMonikerEntry"));
-
-  room_text = (char *) gtk_entry_get_text (room_entry);
-  nick_text = (char *) gtk_entry_get_text (nick_entry);
-
-  create_chat_room_tab (room_text, nick_text);
-
-  gtk_entry_set_text (nick_entry, "");
-  gtk_entry_set_text (room_entry, "");
-}
-
-int
+static int
 create_chat_room_tab (char *room_name, char *nick)
 {
   GladeXML *chatXML;
@@ -291,6 +293,7 @@ create_chat_room_tab (char *room_name, char *nick)
   struct GNUNET_CHAT_gui_chat_client *client;
   struct GNUNET_CHAT_gui_chat_client *pos;
   struct GNUNET_ECRS_MetaData * meta;
+  GNUNET_HashCode me;
 
   chatnotebook =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "chatnotebook");
@@ -316,9 +319,11 @@ create_chat_room_tab (char *room_name, char *nick)
     GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick,
                            meta,
                            room_name,
+                           -1, 
                            &receive_callback, client, &member_list_callback,
                            client,
-                           NULL, NULL);
+                           NULL, NULL,
+                           &me);
   GNUNET_ECRS_meta_data_destroy(meta);
   client->room = chatRoom;
   client->chatFrame = newChatWindow;
@@ -340,11 +345,30 @@ create_chat_room_tab (char *room_name, char *nick)
   return GNUNET_OK;
 }
 
-int
-remove_chat_room_tab (char *room_name)
+
+
+void
+on_chat_room_name_button_click_event_chat (GtkWidget * widget, gpointer data)
 {
+  GtkEntry *room_entry;
+  GtkEntry *nick_entry;
+  char *room_text;
+  char *nick_text;
 
-  return GNUNET_SYSERR;
+  room_entry =
+    GTK_ENTRY (glade_xml_get_widget
+               (GNUNET_GTK_get_main_glade_XML (), "chatRoomNameEntry"));
+  nick_entry =
+    GTK_ENTRY (glade_xml_get_widget
+               (GNUNET_GTK_get_main_glade_XML (), "chatRoomMonikerEntry"));
+
+  room_text = (char *) gtk_entry_get_text (room_entry);
+  nick_text = (char *) gtk_entry_get_text (nick_entry);
+
+  create_chat_room_tab (room_text, nick_text);
+
+  gtk_entry_set_text (nick_entry, "");
+  gtk_entry_set_text (room_entry, "");
 }
 
 void