aboutsummaryrefslogtreecommitdiff
path: root/src/ui/messages.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/messages.c')
-rw-r--r--src/ui/messages.c19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/ui/messages.c b/src/ui/messages.c
index 70d64df..9b0a692 100644
--- a/src/ui/messages.c
+++ b/src/ui/messages.c
@@ -86,6 +86,11 @@ messages_event(UI_MESSAGES_Handle *messages,
86 messages->line_selected++; 86 messages->line_selected++;
87 break; 87 break;
88 } 88 }
89 case '\t':
90 {
91 app->chat.show_members = TRUE;
92 break;
93 }
89 case '\n': 94 case '\n':
90 case KEY_ENTER: 95 case KEY_ENTER:
91 { 96 {
@@ -337,7 +342,6 @@ _message_compare_timestamps(UNUSED void *cls,
337 342
338void 343void
339messages_add(UI_MESSAGES_Handle *messages, 344messages_add(UI_MESSAGES_Handle *messages,
340 struct GNUNET_CHAT_Context *context,
341 const struct GNUNET_CHAT_Message *message) 345 const struct GNUNET_CHAT_Message *message)
342{ 346{
343 enum GNUNET_CHAT_MessageKind kind = GNUNET_CHAT_message_get_kind(message); 347 enum GNUNET_CHAT_MessageKind kind = GNUNET_CHAT_message_get_kind(message);
@@ -351,15 +355,6 @@ messages_add(UI_MESSAGES_Handle *messages,
351 break; 355 break;
352 } 356 }
353 357
354 struct GNUNET_CHAT_Contact *sender = GNUNET_CHAT_message_get_sender(message);
355 struct GNUNET_CHAT_Group *group = GNUNET_CHAT_context_get_group(context);
356
357 if ((GNUNET_CHAT_KIND_JOIN == kind) &&
358 (GNUNET_CHAT_member_get_user_pointer(group, sender)))
359 {
360 return;
361 }
362
363 const int height = getmaxy(messages->window) - getbegy(messages->window); 358 const int height = getmaxy(messages->window) - getbegy(messages->window);
364 const int line_height = height - 2; 359 const int line_height = height - 2;
365 360
@@ -384,9 +379,6 @@ messages_add(UI_MESSAGES_Handle *messages,
384 element 379 element
385 ); 380 );
386 381
387 if (GNUNET_CHAT_KIND_JOIN == kind)
388 GNUNET_CHAT_member_set_user_pointer(group, sender, element);
389
390 if (messages->line_selected >= count) 382 if (messages->line_selected >= count)
391 messages->line_selected = count + 1; 383 messages->line_selected = count + 1;
392 384
@@ -396,7 +388,6 @@ messages_add(UI_MESSAGES_Handle *messages,
396 388
397void 389void
398messages_remove(UI_MESSAGES_Handle *messages, 390messages_remove(UI_MESSAGES_Handle *messages,
399 UNUSED struct GNUNET_CHAT_Context *context,
400 const struct GNUNET_CHAT_Message *message) 391 const struct GNUNET_CHAT_Message *message)
401{ 392{
402 UI_MESSAGES_List *element = messages->head; 393 UI_MESSAGES_List *element = messages->head;