1 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index 159627f0..fb3b609a 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -49,6 +49,7 @@ struct GNUNET_CHAT_safe_nick_write_struct
 struct GNUNET_CHAT_gui_chat_client
 {
   struct GNUNET_CHAT_gui_chat_client *next;
+  GtkWidget * send_button;
   GtkWidget * text_view;
   GtkListStore * nick_model;
   GtkWidget *chatFrame;
@@ -90,18 +91,18 @@ write_save_call (void *arg)
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cls->text_view));
   message_buf_size =
     snprintf (NULL, 0,
-              "<%s> %s\n", 
+              "<%s>: %s\n", 
               cls->sender,
               cls->message);
   message_buf = GNUNET_malloc (message_buf_size + 1);
   GNUNET_snprintf (message_buf, 
                    message_buf_size + 1,
-                   "<%s> %s\n",
+                   "<%s>: %s\n",
                    cls->sender,
                    cls->message);
   gtk_text_buffer_insert_at_cursor (buffer,
                                     message_buf,
-                                    message_buf_size + 1);
+                                    message_buf_size);
   GNUNET_free(message_buf);
   return NULL;
 }
@@ -116,7 +117,7 @@ add_nick_save_call (void *arg)
   GtkListStore * model;
   GtkTreeIter iter;
   GNUNET_HashCode * pid;
-
+  
   model = GTK_LIST_STORE (cls->model);
   gtk_list_store_append (model, &iter);
   pid = GNUNET_malloc(sizeof(GNUNET_HashCode));
@@ -238,16 +239,14 @@ member_list_callback (void *cls,
 void
 on_chat_frame_send_button_click_event_chat (GtkWidget * widget, gpointer data)
 {
-  GtkWidget *chatnotebook;
   unsigned int seq;
   const char *message;
   struct GNUNET_CHAT_gui_chat_client *pos;
 
-  chatnotebook = gtk_widget_get_ancestor (widget, GTK_TYPE_NOTEBOOK);
   GNUNET_mutex_lock(lock);
   pos = list;
   while ( (pos != NULL) &&
-          (pos->chatFrame != chatnotebook) )
+          (pos->send_button != widget) )
     pos = pos->next;
   GNUNET_GE_ASSERT(NULL, pos != NULL);
   
@@ -257,6 +256,7 @@ on_chat_frame_send_button_click_event_chat (GtkWidget * widget, gpointer data)
                             GNUNET_CHAT_MSG_OPTION_NONE, 
                             NULL, &seq);
   gtk_entry_set_text (GTK_ENTRY(pos->chat_entry), "");
+  GNUNET_mutex_unlock(lock);
 }
 
 /** FIXME: move to gtkcommon! */
@@ -299,21 +299,21 @@ create_chat_room_tab (const char *room_name,
   client->chatFrame = extractMainWidgetFromWindow (client->chatXML,
                                                    "chatFrame");
   chatLabel = gtk_label_new (room_name);
-  gtk_notebook_insert_page (GTK_NOTEBOOK (chatnotebook), 
+  gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook), 
                             client->chatFrame,
-                            chatLabel, 1);
-  gtk_widget_show (client->chatFrame);
-  gtk_widget_show (chatLabel);
+                            chatLabel);
+  gtk_widget_show (chatnotebook);
 
   client->nick_model = gtk_list_store_new (CHAT_NUM,
                                            G_TYPE_STRING,       /* nickname */
                                            G_TYPE_POINTER,      /* metadata */
                                            GDK_TYPE_PIXBUF,     /* icon */
                                            G_TYPE_POINTER);      /* pid */
+  client->send_button = glade_xml_get_widget (client->chatXML, "chatSendButton");
   client->text_view = glade_xml_get_widget (client->chatXML, "chatLogViewer");
   client->chat_entry = glade_xml_get_widget (client->chatXML, "chatLineTextEntry");
   treeview = GTK_TREE_VIEW(glade_xml_get_widget (client->chatXML, "roomMembersTreeView"));
-  gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (list->nick_model));
+  gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (client->nick_model));
 
   renderer = gtk_cell_renderer_text_new ();
   col = gtk_tree_view_insert_column_with_attributes (treeview,