1 files changed, 16 insertions, 12 deletions

diff --git a/src/chat/messenger.c b/src/chat/messenger.c
index 452e476..6a3f0b9 100644
--- a/src/chat/messenger.c
+++ b/src/chat/messenger.c
@@ -101,6 +101,14 @@ _chat_messenger_message(void *cls,
 
   switch (kind)
   {
+    case GNUNET_CHAT_KIND_WARNING:
+      application_call_message_event(
+          app,
+          event_handle_warning,
+          context,
+          message
+      );
+      break;
     case GNUNET_CHAT_KIND_REFRESH:
     {
       application_call_event(app, event_refresh_accounts);
@@ -122,23 +130,19 @@ _chat_messenger_message(void *cls,
       break;
     }
     case GNUNET_CHAT_KIND_JOIN:
+    case GNUNET_CHAT_KIND_LEAVE:
     {
       application_call_message_event(
-          app,
-          (GNUNET_YES == GNUNET_CHAT_message_is_sent(message)?
-              event_update_chats :
-              event_joining_contact
-          ),
-          context,
-          message
+          app,
+          (GNUNET_YES == GNUNET_CHAT_message_is_sent(message)?
+              event_update_chats :
+              event_presence_contact
+          ),
+          context,
+          message
       );
       break;
     }
-    case GNUNET_CHAT_KIND_LEAVE:
-    {
-      // TODO: add status message
-      break;
-    }
     case GNUNET_CHAT_KIND_CONTACT:
     {
       application_call_message_event(