[GNUnet-SVN] r6948 - in GNUnet/src: applications/chat/lib applications/chat/tools include

[gnunet]

Author: grothoff
Date: 2008-05-31 13:37:43 -0600 (Sat, 31 May 2008)
New Revision: 6948

Modified:
   GNUnet/src/applications/chat/lib/messaging.c
   GNUnet/src/applications/chat/tools/gnunet-chat.c
   GNUnet/src/include/gnunet_chat_lib.h
Log:
better API

Modified: GNUnet/src/applications/chat/lib/messaging.c
===================================================================
--- GNUnet/src/applications/chat/lib/messaging.c        2008-05-31 19:34:41 UTC 
(rev 6947)
+++ GNUnet/src/applications/chat/lib/messaging.c        2008-05-31 19:37:43 UTC 
(rev 6948)
@@ -219,6 +219,7 @@
           room->message_callback (room->message_callback_cls,
                                   room,
                                   &received_msg->sender,
+                                 NULL,
                                   message_content,
                                   ntohl (received_msg->msg_options));
           GNUNET_free (message_content);

Modified: GNUnet/src/applications/chat/tools/gnunet-chat.c
===================================================================
--- GNUnet/src/applications/chat/tools/gnunet-chat.c    2008-05-31 19:34:41 UTC 
(rev 6947)
+++ GNUnet/src/applications/chat/tools/gnunet-chat.c    2008-05-31 19:37:43 UTC 
(rev 6948)
@@ -82,7 +82,9 @@
 receive_callback (void *cls,
                   struct GNUNET_CHAT_Room *room,
                   const GNUNET_HashCode * sender,
-                  const char *message, GNUNET_CHAT_MSG_OPTIONS options)
+                 const struct GNUNET_ECRS_MetaData * meta,
+                  const char *message,
+                 GNUNET_CHAT_MSG_OPTIONS options)
 {
   fprintf (stdout, _("`%s' said: %s\n"), "FIXME", message);
   return GNUNET_OK;
@@ -158,8 +160,8 @@
                                 nickname,
                                 meta,
                                 room_name,
-                                &receive_callback,
-                                NULL, &member_list_callback, NULL,
+                                &receive_callback, NULL, 
+                               &member_list_callback, NULL,
                                 &confirmation_callback, NULL);
   GNUNET_ECRS_meta_data_destroy (meta);
   if (room == NULL)

Modified: GNUnet/src/include/gnunet_chat_lib.h
===================================================================
--- GNUnet/src/include/gnunet_chat_lib.h        2008-05-31 19:34:41 UTC (rev 
6947)
+++ GNUnet/src/include/gnunet_chat_lib.h        2008-05-31 19:37:43 UTC (rev 
6948)
@@ -127,7 +127,8 @@
 typedef int (*GNUNET_CHAT_MessageCallback) (void *cls,
                                             struct GNUNET_CHAT_Room * room,
                                             const GNUNET_HashCode * sender,
-                                            const char *message,
+                                           const struct GNUNET_ECRS_MetaData 
*member_info,
+                                           const char *message,
                                             GNUNET_CHAT_MSG_OPTIONS options);
 
 /**