[GNUnet-SVN] r6617 - gnunet-gtk/src/plugins/chat

[gnunet]

Author: grothoff
Date: 2008-03-25 00:28:11 -0600 (Tue, 25 Mar 2008)
New Revision: 6617

Modified:
   gnunet-gtk/src/plugins/chat/chat.c
Log:
update to match API change

Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c  2008-03-25 06:23:55 UTC (rev 6616)
+++ gnunet-gtk/src/plugins/chat/chat.c  2008-03-25 06:28:11 UTC (rev 6617)
@@ -193,11 +193,11 @@
 
 static int
 member_list_callback (void *cls, const char *senderNick,
+                     int is_joining,
                       GNUNET_CronTime timestamp)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
   GtkWidget *chatnicklist;
-
   struct GNUNET_CHAT_safe_nick_write_struct writearg;
 
   chatnicklist =
@@ -210,39 +210,16 @@
   /* chatnicklist is the GtkTextView object */
   writearg.nick = senderNick;
   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);
 
-  GNUNET_GTK_save_call (&write_nick_save_call, &writearg);
-
   return GNUNET_OK;
 }
 
-static int
-member_remove_callback (void *cls, const char *senderNick,
-                        GNUNET_CronTime timestamp)
-{
-  struct GNUNET_CHAT_gui_chat_client *client = cls;
-  GtkWidget *chatnicklist;
-
-  struct GNUNET_CHAT_safe_nick_write_struct writearg;
-
-  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);
-
-  /* chatnicklist is the GtkTextView object */
-  writearg.nick = senderNick;
-  writearg.nickList = chatnicklist;
-
-  GNUNET_GTK_save_call (&remove_nick_save_call, &writearg);
-
-  return GNUNET_OK;
-}
-
 void
 init_chat (struct GNUNET_GE_Context *ectx,
            struct GNUNET_GC_Configuration *cfg)
@@ -327,8 +304,7 @@
   chatRoom =
     GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick, room_name, &pub_key,
                            priv_key, "", &receive_callback, client,
-                           &member_list_callback, client,
-                           &member_remove_callback, client);
+                           &member_list_callback, client);
 
   client->room = chatRoom;
   client->chatFrame = newChatWindow;